Add structure tests for gerrit-master container

Change-Id: I2cea248f5c6d6a3fe982ed137592025d5e7d580c
diff --git a/tests/conftest.py b/tests/conftest.py
index ba4f695..8ee5d40 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -141,6 +141,11 @@
     "apache-git-http-backend")
 
 @pytest.fixture(scope="session")
+def gerrit_master_image(container_images, docker_build, base_image,
+                        gerrit_base_image):
+  return docker_build(container_images["gerrit-master"], "gerrit-master")
+
+@pytest.fixture(scope="session")
 def mysql_replication_init_image(container_images, docker_build):
   return docker_build(
     container_images["mysql-replication-init"],
diff --git a/tests/container-images/gerrit-master/test_container_build_gerrit_master.py b/tests/container-images/gerrit-master/test_container_build_gerrit_master.py
new file mode 100644
index 0000000..8164a31
--- /dev/null
+++ b/tests/container-images/gerrit-master/test_container_build_gerrit_master.py
@@ -0,0 +1,20 @@
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import pytest
+
+def test_build_gerrit_master(gerrit_master_image, tag_of_cached_container):
+  if tag_of_cached_container:
+    pytest.skip("Cached image used for testing. Build will not be tested.")
+  assert gerrit_master_image.id is not None
diff --git a/tests/container-images/gerrit-master/test_container_structure_gerrit_master.py b/tests/container-images/gerrit-master/test_container_structure_gerrit_master.py
new file mode 100755
index 0000000..f181d17
--- /dev/null
+++ b/tests/container-images/gerrit-master/test_container_structure_gerrit_master.py
@@ -0,0 +1,43 @@
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import pytest
+
+@pytest.fixture(scope="module")
+def container_run(request, docker_client, gerrit_master_image):
+  container_run = docker_client.containers.run(
+    image=gerrit_master_image.id,
+    user="gerrit",
+    detach=True,
+    auto_remove=True
+  )
+
+  def stop_container():
+    container_run.stop(timeout=1)
+
+  request.addfinalizer(stop_container)
+
+  return container_run
+
+def test_gerrit_master_inherits_from_gerrit_base(gerrit_master_image):
+  contains_tag = False
+  for layer in gerrit_master_image.history():
+    contains_tag = layer['Tags'] is not None and "gerrit-base:latest" in layer['Tags']
+    if contains_tag:
+      break
+  assert contains_tag
+
+def test_gerrit_master_contains_start_script(container_run):
+  exit_code, _ = container_run.exec_run("test -f /var/tools/start")
+  assert exit_code == 0