diff options
| author | Palica <palica+gitlab@liguros.net> | 2020-06-23 22:35:08 +0200 |
|---|---|---|
| committer | Palica <palica+gitlab@liguros.net> | 2020-06-23 22:35:08 +0200 |
| commit | ecdac123787b96ce6649f0f91da12ea6458cc2b1 (patch) | |
| tree | b89c74d9e6fe6e8aebc4c77bcbeb4ab73214127d /dev-python/pytest-services/files | |
| parent | 1be72aa41cf41dedadeecf59dca9f01de6381f5e (diff) | |
| download | baldeagleos-repo-ecdac123787b96ce6649f0f91da12ea6458cc2b1.tar.gz baldeagleos-repo-ecdac123787b96ce6649f0f91da12ea6458cc2b1.tar.xz baldeagleos-repo-ecdac123787b96ce6649f0f91da12ea6458cc2b1.zip | |
Updating liguros repo
Diffstat (limited to 'dev-python/pytest-services/files')
| -rw-r--r-- | dev-python/pytest-services/files/pytest-services-2.0.1-lockdir.patch | 23 | ||||
| -rw-r--r-- | dev-python/pytest-services/files/pytest-services-2.0.1-no-mysql.patch | 25 |
2 files changed, 48 insertions, 0 deletions
diff --git a/dev-python/pytest-services/files/pytest-services-2.0.1-lockdir.patch b/dev-python/pytest-services/files/pytest-services-2.0.1-lockdir.patch new file mode 100644 index 000000000000..0ecf7be8c3c0 --- /dev/null +++ b/dev-python/pytest-services/files/pytest-services-2.0.1-lockdir.patch @@ -0,0 +1,23 @@ +diff -ur pytest-services-2.0.1.orig/pytest_services/folders.py pytest-services-2.0.1/pytest_services/folders.py +--- pytest-services-2.0.1.orig/pytest_services/folders.py 2019-11-12 13:04:01.000000000 -0800 ++++ pytest-services-2.0.1/pytest_services/folders.py 2019-11-20 23:26:55.760949590 -0800 +@@ -9,7 +9,7 @@ + @pytest.fixture(scope='session') + def root_dir(): + """The parent directory of the test base artifact directory.""" +- return '/tmp' ++ return os.getenv("TMPDIR") or '/tmp' + + + @pytest.yield_fixture(scope='session') +@@ -47,7 +47,8 @@ + def memory_root_dir(root_dir): + """The parent directory of the test artifact directory in memory.""" + # check for a free space for at least 8 parallel processes +- if os.path.exists('/dev/shm') and psutil.disk_usage('/dev/shm').free > 1024 * 1024 * 64 * 10: ++ if os.path.exists('/dev/shm') and psutil.disk_usage('/dev/shm').free > 1024 * 1024 * 64 * 10 \ ++ and os.access('/dev/shm', os.W_OK): + return '/dev/shm' + return root_dir + +Only in pytest-services-2.0.1/pytest_services: .folders.py.un~ diff --git a/dev-python/pytest-services/files/pytest-services-2.0.1-no-mysql.patch b/dev-python/pytest-services/files/pytest-services-2.0.1-no-mysql.patch new file mode 100644 index 000000000000..2a86f5110d5e --- /dev/null +++ b/dev-python/pytest-services/files/pytest-services-2.0.1-no-mysql.patch @@ -0,0 +1,25 @@ +diff -ur pytest-services-2.0.1.orig/tests/test_plugin.py pytest-services-2.0.1/tests/test_plugin.py +--- pytest-services-2.0.1.orig/tests/test_plugin.py 2019-11-12 13:04:01.000000000 -0800 ++++ pytest-services-2.0.1/tests/test_plugin.py 2019-11-20 19:28:17.789932680 -0800 +@@ -3,7 +3,6 @@ + import socket + + import pylibmc +-import MySQLdb + + + def test_memcached(request, memcached, memcached_socket): +@@ -17,12 +16,6 @@ + assert mc.get('some') is None + + +-def test_mysql(mysql, mysql_connection, mysql_socket): +- """Test mysql service.""" +- conn = MySQLdb.connect(user='root', unix_socket=mysql_socket) +- assert conn +- +- + def test_xvfb(xvfb, xvfb_display): + """Test xvfb service.""" + socket.create_connection(('127.0.0.1', 6000 + xvfb_display)) +Only in pytest-services-2.0.1/tests: .test_plugin.py.un~ |