fix test; make package use dev version by default

morganstanley · Jan 2, 2025 · 47b0da7 · 47b0da7
1 parent 7110fe0
commit 47b0da7
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/test_pr.yml b/.github/workflows/test_pr.yml
@@ -133,7 +133,7 @@ jobs:
       - name: Set up Kafka for tests
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
-          wget https://archive.apache.org/dist/kafka/3.5.2/kafka_2.13-3.5.2.tgz -O kafka.tgz
+          wget https://dlcdn.apache.org/kafka/3.9.0/kafka_2.13-3.9.0.tgz -O kafka.tgz
           sudo mkdir /opt/kafka
           sudo chown -R $USER:$USER /opt/kafka
           tar zxf kafka.tgz -C /opt/kafka --strip-components 1

diff --git a/testplan/exporters/testing/xml/__init__.py b/testplan/exporters/testing/xml/__init__.py
@@ -292,9 +292,11 @@ def export(
         )
         xml_dir = pathlib.Path(self.cfg.xml_dir).resolve()
 
-        # TODO: what if xml_dir is a file?
         if xml_dir.exists():
-            shutil.rmtree(xml_dir)
+            if xml_dir.is_dir():
+                shutil.rmtree(xml_dir)
+            else:
+                xml_dir.unlink()
 
         xml_dir.mkdir(parents=True, exist_ok=True)
 

diff --git a/testplan/version.py b/testplan/version.py
@@ -3,7 +3,7 @@
 
 __version__ = "24.9.2"
 
-dev_build = int(os.environ.get("DEV_BUILD", "0"))
+dev_build = int(os.environ.get("DEV_BUILD", "1"))
 dev_suffix = f"dev{int(time.time())}" if dev_build else ""
 
 __build_version__ = f"{__version__}{dev_suffix}"
diff --git a/tests/functional/testplan/cli/data/curr.data b/tests/functional/testplan/cli/data/curr.data
@@ -499,6 +499,10 @@
   "label": null,
   "tags_index": {},
   "information": [
+    [
+      "testplan_version",
+      "24.9.2.dev1735810598"
+    ],
     [
       "user",
       "unknown"

diff --git a/tests/functional/testplan/runnable/interactive/test_api.py b/tests/functional/testplan/runnable/interactive/test_api.py
@@ -283,7 +283,6 @@ def plan3(tmpdir):
                 ],
                 "name": "ExampleSuite",
                 "parent_uids": ["InteractiveAPITest", "ExampleMTest"],
-                "part": None,
                 "status": "unknown",
                 "runtime_status": "ready",
                 "counter": {
@@ -312,7 +311,6 @@ def plan3(tmpdir):
             ],
             "name": "ExampleSuite",
             "parent_uids": ["InteractiveAPITest", "ExampleMTest"],
-            "part": None,
             "status": "unknown",
             "runtime_status": "ready",
             "counter": {"failed": 0, "passed": 0, "total": 7, "unknown": 7},
@@ -440,7 +438,6 @@ def plan3(tmpdir):
                     "ExampleMTest",
                     "ExampleSuite",
                 ],
-                "part": None,
                 "runtime_status": "ready",
                 "status": "unknown",
                 "tags": {},

diff --git a/tests/functional/testplan/runnable/interactive/test_interactive.py b/tests/functional/testplan/runnable/interactive/test_interactive.py
@@ -9,7 +9,7 @@
 
 from testplan import TestplanMock
 from testplan.common import entity
-from testplan.common.utils.comparison import compare, ReportOptions
+from testplan.common.utils.comparison import compare
 from testplan.common.utils.context import context
 from testplan.common.utils.logger import USER_INFO
 from testplan.common.utils.timing import wait