From d0c8f77ba697c9a7318077dc96a32701adeb2143 Mon Sep 17 00:00:00 2001 From: Steven Murawski Date: Wed, 15 May 2024 20:28:39 -0500 Subject: [PATCH] moved samples directory --- src/tests/compose_generator/__init__.py | 12 ++++++------ {sample => src/tests/sample}/apps/web.env | 0 {sample => src/tests/sample}/common.env | 0 {sample => src/tests/sample}/my_secret.txt | 0 {sample => src/tests/sample}/opt/runtime_opts.env | 0 {sample => src/tests/sample}/test.env | 0 src/tests/service/test_service_environment_file.py | 4 ++-- src/tests/service/test_service_secret_file.py | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) rename {sample => src/tests/sample}/apps/web.env (100%) rename {sample => src/tests/sample}/common.env (100%) rename {sample => src/tests/sample}/my_secret.txt (100%) rename {sample => src/tests/sample}/opt/runtime_opts.env (100%) rename {sample => src/tests/sample}/test.env (100%) diff --git a/src/tests/compose_generator/__init__.py b/src/tests/compose_generator/__init__.py index d37bdc5..005c73f 100644 --- a/src/tests/compose_generator/__init__.py +++ b/src/tests/compose_generator/__init__.py @@ -398,7 +398,7 @@ def get_compose_with_environment_file_single(): services: frontend: image: awesome/webapp - env_file: ./sample/test.env + env_file: ./src/tests/sample/test.env environment: - RACK_ENV=development - SHOW=true @@ -414,9 +414,9 @@ def get_compose_with_environment_file_list(): frontend: image: awesome/webapp env_file: - - ./sample/common.env - - ./sample/apps/web.env - - ./sample/opt/runtime_opts.env + - ./src/tests/sample/common.env + - ./src/tests/sample/apps/web.env + - ./src/tests/sample/opt/runtime_opts.env environment: - RACK_ENV=canary - SHOW=true @@ -482,7 +482,7 @@ def get_compose_with_one_secret(): - my_secret secrets: my_secret: - file: ./sample/my_secret.txt + file: ./src/tests/sample/my_secret.txt """ return ComposeGenerator.convert_yaml_to_compose_file(compose) @@ -514,7 +514,7 @@ def get_compose_with_long_syntax(): mode: 0440 secrets: my_secret: - file: ./sample/my_secret.txt + file: ./src/tests/sample/my_secret.txt my_other_secret: external: true """ diff --git a/sample/apps/web.env b/src/tests/sample/apps/web.env similarity index 100% rename from sample/apps/web.env rename to src/tests/sample/apps/web.env diff --git a/sample/common.env b/src/tests/sample/common.env similarity index 100% rename from sample/common.env rename to src/tests/sample/common.env diff --git a/sample/my_secret.txt b/src/tests/sample/my_secret.txt similarity index 100% rename from sample/my_secret.txt rename to src/tests/sample/my_secret.txt diff --git a/sample/opt/runtime_opts.env b/src/tests/sample/opt/runtime_opts.env similarity index 100% rename from sample/opt/runtime_opts.env rename to src/tests/sample/opt/runtime_opts.env diff --git a/sample/test.env b/src/tests/sample/test.env similarity index 100% rename from sample/test.env rename to src/tests/sample/test.env diff --git a/src/tests/service/test_service_environment_file.py b/src/tests/service/test_service_environment_file.py index 1f0f8d8..f6c1667 100644 --- a/src/tests/service/test_service_environment_file.py +++ b/src/tests/service/test_service_environment_file.py @@ -8,7 +8,7 @@ def test_service_with_single_environment_file(self): compose_file = ComposeGenerator.get_compose_with_environment_file_single() environment_from_file = compose_file.services["frontend"].env_file.readFile() - self.assertEqual(compose_file.services["frontend"].env_file[0], "./sample/test.env") + self.assertEqual(compose_file.services["frontend"].env_file[0], "./src/tests/sample/test.env") self.assertEqual(environment_from_file["RACK_ENV"], "development") self.assertEqual(environment_from_file["VAR"], '"quoted"') self.assertEqual(environment_from_file["SOME_VAR"], '"value with equals=sign"') @@ -17,7 +17,7 @@ def test_service_with_list_environment_file(self): compose_file = ComposeGenerator.get_compose_with_environment_file_list() environment_from_file = compose_file.services["frontend"].env_file.readFile() - self.assertEqual(compose_file.services["frontend"].env_file, ['./sample/common.env', './sample/apps/web.env', './sample/opt/runtime_opts.env']) + self.assertEqual(compose_file.services["frontend"].env_file, ['./src/tests/sample/common.env', './src/tests/sample/apps/web.env', './src/tests/sample/opt/runtime_opts.env']) self.assertEqual(environment_from_file["RACK_ENV"], "development") self.assertEqual(environment_from_file["VAR"], '"quoted"') self.assertEqual(environment_from_file["BAR"], "faz") diff --git a/src/tests/service/test_service_secret_file.py b/src/tests/service/test_service_secret_file.py index c86cb12..ed7b242 100644 --- a/src/tests/service/test_service_secret_file.py +++ b/src/tests/service/test_service_secret_file.py @@ -11,7 +11,7 @@ def test_service_with_single_secret(self): secret_from_file = compose_file.secrets["my_secret"].file.readFile() self.assertEqual(compose_file.services["frontend"].secrets[0].source, "my_secret") - self.assertEqual(compose_file.secrets["my_secret"].file, "./sample/my_secret.txt") + self.assertEqual(compose_file.secrets["my_secret"].file, "./src/tests/sample/my_secret.txt") self.assertEqual(secret_from_file, secret_value) def test_service_with_external_secret(self): @@ -30,5 +30,5 @@ def test_service_with_long_syntax(self): self.assertEqual(compose_file.services["frontend"].secrets[0].target, "redis_secret") self.assertEqual(compose_file.services["frontend"].secrets[0].uid, 103) self.assertEqual(compose_file.services["frontend"].secrets[0].gid, 103) - self.assertEqual(compose_file.secrets["my_secret"].file, "./sample/my_secret.txt") + self.assertEqual(compose_file.secrets["my_secret"].file, "./src/tests/sample/my_secret.txt") self.assertEqual(secret_from_file, secret_value)