Skip to content

Commit d79ff01

Browse files
p12ticp12tic
authored
Merge pull request containers#1113 from mokibit/categorize-integration-tests
tests/integration: Categorize integration tests
2 parents f376700 + d9ef3d2 commit d79ff01

File tree

64 files changed

+391
-352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+391
-352
lines changed

‎tests/integration/additional_contexts/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎tests/integration/test_podman_compose_additional_contexts.py renamed to ‎tests/integration/additional_contexts/test_podman_compose_additional_contexts.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import subprocess
88
import unittest
99

10-
from tests.integration.test_podman_compose import podman_compose_path
11-
from tests.integration.test_podman_compose import test_path
10+
from tests.integration.test_utils import podman_compose_path
11+
from tests.integration.test_utils import test_path
1212

1313

1414
def compose_yaml_path():

‎tests/integration/build/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎tests/integration/test_podman_compose_build.py renamed to ‎tests/integration/build/test_podman_compose_build.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import requests
77

8-
from tests.integration.test_podman_compose import podman_compose_path
9-
from tests.integration.test_podman_compose import test_path
8+
from tests.integration.test_utils import podman_compose_path
9+
from tests.integration.test_utils import test_path
1010
from tests.integration.test_utils import RunSubprocessMixin
1111

1212

‎tests/integration/build_fail/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎tests/integration/test_podman_compose_build_fail.py renamed to ‎tests/integration/build_fail/test_podman_compose_build_fail.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import os
44
import unittest
55

6-
from tests.integration.test_podman_compose import podman_compose_path
7-
from tests.integration.test_podman_compose import test_path
86
from tests.integration.test_utils import RunSubprocessMixin
7+
from tests.integration.test_utils import podman_compose_path
8+
from tests.integration.test_utils import test_path
99

1010

1111
def compose_yaml_path():

‎tests/integration/build_labels/__init__.py

Whitespace-only changes.

‎tests/integration/build_labels/test_build_labels.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import os
66
import unittest
77

8-
from tests.integration.test_podman_compose import podman_compose_path
9-
from tests.integration.test_podman_compose import test_path
108
from tests.integration.test_utils import RunSubprocessMixin
9+
from tests.integration.test_utils import podman_compose_path
10+
from tests.integration.test_utils import test_path
1111

1212

1313
class TestBuildLabels(unittest.TestCase, RunSubprocessMixin):

‎tests/integration/build_secrets/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎tests/integration/test_podman_compose_build_secrets.py renamed to ‎tests/integration/build_secrets/test_podman_compose_build_secrets.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import subprocess
88
import unittest
99

10-
from tests.integration.test_podman_compose import podman_compose_path
11-
from tests.integration.test_podman_compose import test_path
10+
from tests.integration.test_utils import podman_compose_path
11+
from tests.integration.test_utils import test_path
1212

1313

1414
def compose_yaml_path():

0 commit comments

Comments
 (0)