#9, #14: Add missing files synchronization

riotkit-org · Jul 12, 2020 · 1cb6f4e · 1cb6f4e
1 parent 091a693
commit 1cb6f4e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/harbor/test.py b/src/harbor/test.py
@@ -101,6 +101,14 @@ def recreate_structure(cls):
 
         subprocess.check_call(['rm', '-rf', CURRENT_TEST_ENV_PATH])
         subprocess.check_call(['cp', '-pr', ENV_SIMPLE_PATH, CURRENT_TEST_ENV_PATH])
+
+        # copy from base structure - as we test eg. things like default configurations, NGINX template
+        for directory in ['containers', 'data', 'hooks.d', 'apps/www-data']:
+            subprocess.check_call('rm -rf %s/%s' % (ENV_SIMPLE_PATH, directory), shell=True)
+            subprocess.check_call('cp -pr %s/project/%s %s/%s' % (
+                HARBOR_MODULE_PATH, directory, CURRENT_TEST_ENV_PATH, directory
+            ), shell=True)
+
         cls.mock_compose({'services': {}})
 
     @classmethod

diff --git a/test/testdata/env_simple/apps/www-data/.gitkeep b/test/testdata/env_simple/apps/www-data/.gitkeep
diff --git a/test/testdata/env_simple/hooks.d/pre-upgrade/.gitkeep b/test/testdata/env_simple/hooks.d/pre-upgrade/.gitkeep