Generate fake_root for selfupdate test dynamically.

Fixes OTA-2706 (Remove tests/test_data/fake_root). Also fixes the last broken test due to the Target matching changes. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
advancedtelematic · Jul 18, 2019 · 1935f07 · 1935f07
1 parent 5a476c2
commit 1935f07
Show file tree

Hide file tree

Showing 21 changed files with 7 additions and 86 deletions.
diff --git a/scripts/build_ubuntu.sh b/scripts/build_ubuntu.sh
@@ -20,7 +20,7 @@ LDFLAGS="-s" "$GITREPO_ROOT/scripts/test.sh"
 cp -rf "$GITREPO_ROOT/tests/test_data/prov_selfupdate" "$TEST_INSTALL_DESTDIR"
 cp -rf "$GITREPO_ROOT/tests/config/selfupdate.toml" "$TEST_INSTALL_DESTDIR"
 cp -rf "$GITREPO_ROOT/scripts/selfupdate_server.py" "$TEST_INSTALL_DESTDIR"
-cp -rf "$GITREPO_ROOT/tests/test_data/fake_root" "$TEST_INSTALL_DESTDIR"
+cp -rf "$GITREPO_ROOT/tests/test_data/selfupdate_2.0" "$TEST_INSTALL_DESTDIR"
 cp -rf "$GITREPO_ROOT/src/aktualizr_repo/run/create_repo.sh" "$TEST_INSTALL_DESTDIR"
 cp -rf "$GITREPO_ROOT/src/aktualizr_repo/run/serve_repo.py" "$TEST_INSTALL_DESTDIR"
 

diff --git a/scripts/test_install_aktualizr_and_update.sh b/scripts/test_install_aktualizr_and_update.sh
@@ -4,6 +4,11 @@ set -exuo pipefail
 
 TEST_INSTALL_DESTDIR=${TEST_INSTALL_DESTDIR:-/persistent}
 
+aktualizr-repo generate --path "$TEST_INSTALL_DESTDIR/fake_root"
+aktualizr-repo image --path "$TEST_INSTALL_DESTDIR/fake_root" --targetname selfupdate_2.0 --filename "$TEST_INSTALL_DESTDIR/selfupdate_2.0" --hwid selfupdate-device
+aktualizr-repo addtarget --path "$TEST_INSTALL_DESTDIR/fake_root" --targetname selfupdate_2.0 --hwid selfupdate-device --serial 723f79763eda1c753ce565c16862c79acdde32eb922d6662f088083c51ffde66
+aktualizr-repo signtargets --path "$TEST_INSTALL_DESTDIR/fake_root"
+
 "$TEST_INSTALL_DESTDIR/selfupdate_server.py" 8000 "$TEST_INSTALL_DESTDIR"&
 
 dpkg-deb -I "$TEST_INSTALL_DESTDIR"/aktualizr*.deb && dpkg -i "$TEST_INSTALL_DESTDIR"/aktualizr*.deb

diff --git a/tests/config/selfupdate.toml b/tests/config/selfupdate.toml
@@ -13,7 +13,7 @@ key_source = "file"
 
 [provision]
 primary_ecu_serial = "723f79763eda1c753ce565c16862c79acdde32eb922d6662f088083c51ffde66"
-primary_ecu_hardware_id = "patriotyk-laptop"
+primary_ecu_hardware_id = "selfupdate-device"
 
 [pacman]
 type = "debian"
diff --git a/tests/test_data/fake_root/keys/director/key_type b/tests/test_data/fake_root/keys/director/key_type
diff --git a/tests/test_data/fake_root/keys/director/private.key b/tests/test_data/fake_root/keys/director/private.key
diff --git a/tests/test_data/fake_root/keys/director/public.key b/tests/test_data/fake_root/keys/director/public.key
diff --git a/tests/test_data/fake_root/keys/image/key_type b/tests/test_data/fake_root/keys/image/key_type
diff --git a/tests/test_data/fake_root/keys/image/private.key b/tests/test_data/fake_root/keys/image/private.key
diff --git a/tests/test_data/fake_root/keys/image/public.key b/tests/test_data/fake_root/keys/image/public.key
diff --git a/tests/test_data/fake_root/repo/director/1.root.json b/tests/test_data/fake_root/repo/director/1.root.json
diff --git a/tests/test_data/fake_root/repo/director/manifest b/tests/test_data/fake_root/repo/director/manifest
diff --git a/tests/test_data/fake_root/repo/director/root.json b/tests/test_data/fake_root/repo/director/root.json
diff --git a/tests/test_data/fake_root/repo/director/snapshot.json b/tests/test_data/fake_root/repo/director/snapshot.json
diff --git a/tests/test_data/fake_root/repo/director/targets.json b/tests/test_data/fake_root/repo/director/targets.json
diff --git a/tests/test_data/fake_root/repo/director/timestamp.json b/tests/test_data/fake_root/repo/director/timestamp.json
diff --git a/tests/test_data/fake_root/repo/repo/1.root.json b/tests/test_data/fake_root/repo/repo/1.root.json
diff --git a/tests/test_data/fake_root/repo/repo/root.json b/tests/test_data/fake_root/repo/repo/root.json
diff --git a/tests/test_data/fake_root/repo/repo/snapshot.json b/tests/test_data/fake_root/repo/repo/snapshot.json
diff --git a/tests/test_data/fake_root/repo/repo/targets.json b/tests/test_data/fake_root/repo/repo/targets.json
diff --git a/tests/test_data/fake_root/repo/repo/timestamp.json b/tests/test_data/fake_root/repo/repo/timestamp.json
diff --git a/...ake_root/repo/repo/targets/selfupdate_2.0 → tests/test_data/selfupdate_2.0 b/...ake_root/repo/repo/targets/selfupdate_2.0 → tests/test_data/selfupdate_2.0