Skip to content

Commit

Permalink
misc
Browse files Browse the repository at this point in the history
  • Loading branch information
zhenyu-ms committed Dec 6, 2024
1 parent f722a82 commit 670a1f3
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 68 deletions.
4 changes: 2 additions & 2 deletions .github/actions/pip-cache/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ runs:
- name: Restore Pip Cache
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ hashFiles('setup.py') }}-${{ hashFiles('requirements.txt') }}
path: ${{ runner.os == 'Linux' && '~/.cache/pip' || '~\AppData\Local\pip\Cache' }}
key: ${{ runner.os }}-${{ hashFiles('pyproject.toml') }}
8 changes: 4 additions & 4 deletions doc/en/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Also find all our downloadable examples :ref:`here <download>`.

Working with the source
-----------------------

You will need a working python 3.7+ interrpreter preferably a venv, and for the interactive ui you need node installed.
We are using `doit <https://pydoit.org/contents.html>`_ as the taskrunner ``doit list`` can show all the commands.

Expand All @@ -85,10 +85,10 @@ We are using `doit <https://pydoit.org/contents.html>`_ as the taskrunner ``doit
git clone https://github.com/morganstanley/testplan.git
cd testplan
# install all dev requirements
pip install -r requirements-txt # this install testplan in editable mode
# install testplan in editable mode & all dev requirements
pip install -e .
#build the interactive UI (if you do not like it is opening a browserwindow remove the `-o`)
# build the interactive UI (if you do not like it is opening a browserwindow remove the `-o`)
doit build_ui -o
Internal tests
Expand Down
3 changes: 0 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,9 @@
"setuptools",
"pytest",
"pytest-mock",
"py",
"psutil",
"schema",
"pytz",
"lxml",
"python-dateutil",
"reportlab",
"marshmallow",
"termcolor",
Expand Down
12 changes: 7 additions & 5 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
[pytest]
filterwarnings =
ignore::pytest.PytestWarning
ignore::DeprecationWarning:flask_restx.*:
ignore::DeprecationWarning:jinja2.*:
ignore::DeprecationWarning:jsonschema.*:
ignore::DeprecationWarning:marshmallow.*:
ignore::DeprecationWarning:werkzeug.*:
ignore:.*flask_restx.*:DeprecationWarning
; jsonschema warning from flask_restx
ignore:.*jsonschema.*:DeprecationWarning
ignore:.*load_module.*:DeprecationWarning
ignore:.*LogMatcher.*:UserWarning
; under most cases, included files are not hit
ignore:No data was collected:coverage.exceptions.CoverageWarning

norecursedirs=tests/helpers
44 changes: 0 additions & 44 deletions requirements-basic.txt

This file was deleted.

5 changes: 0 additions & 5 deletions requirements-rtd.txt

This file was deleted.

2 changes: 1 addition & 1 deletion testplan/testing/multitest/driver/http/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def send(self, method, api, **kwargs):
args=(method, api, drop_response, self.timeout),
kwargs=kwargs,
)
request_thread.setDaemon(True)
request_thread.daemon = True
request_thread.start()
self.request_threads.append((request_thread, drop_response))

Expand Down
2 changes: 1 addition & 1 deletion testplan/testing/multitest/driver/http/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ def starting(self):
timeout=self.timeout,
logger=self.logger,
)
self._server_thread.setName(self.name)
self._server_thread.name = self.name
self._server_thread.start()

while not hasattr(self._server_thread.server, "server_port"):
Expand Down
3 changes: 0 additions & 3 deletions tests/unit/testplan/test_parser.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
from jsonschema.cli import parse_args

from testplan import TestplanMock
from testplan.parser import TestplanParser
from testplan.testing.listing import SimpleJsonLister, NameLister


Expand Down

0 comments on commit 670a1f3

Please sign in to comment.