Rename test layouts

Rename unsecure offline and online (docker) test layouts to better distinguish them from the included generic layout that may be used for package verification. The test layouts are signed with a test key that is included in this repo. Hence they should not be use used to verify any package.
in-toto · Jan 18, 2019 · 6bddf4e · 6bddf4e
1 parent ab4c472
commit 6bddf4e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/tests/Dockerfile b/tests/Dockerfile
@@ -13,7 +13,7 @@ RUN chmod +x /usr/lib/apt/methods/intoto
 # Copy apt configuration file, root layout and root layout key
 # FIXME: These should be added when installing the intoto transport
 COPY tests/data/intoto.conf.docker /etc/apt/apt.conf.d/intoto
-COPY tests/data/root.layout.docker /etc/intoto/root.layout
+COPY tests/data/test.layout.docker /etc/intoto/root.layout
 COPY tests/data/alice.asc /etc/intoto/alice.asc
 RUN gpg --import /etc/intoto/alice.asc
 

diff --git a/tests/data/root.layout → tests/data/test.layout b/tests/data/root.layout → tests/data/test.layout
diff --git a/tests/data/root.layout.docker → tests/data/test.layout.docker b/tests/data/root.layout.docker → tests/data/test.layout.docker
diff --git a/tests/test_intoto.py b/tests/test_intoto.py
@@ -67,7 +67,7 @@
   "log_level": LOG_LEVEL,
   "rebuilder1": "http://127.0.0.1:8081",
   "rebuilder2": "http://127.0.0.1:8082",
-  "layout_path": os.path.join(TEST_DATA_PATH, "root.layout"),
+  "layout_path": os.path.join(TEST_DATA_PATH, "test.layout"),
   "layout_keyid": "88876A89E3D4698F83D3DB0E72E33CA3E0E04E46",
   "gpg_home": os.path.join(TEST_DATA_PATH, "gpg_keyring"),
   "no_fail": "false"