From eec142ac152d46e1d417fe260c88e7462a8d566f Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Sat, 12 Jun 2021 12:02:37 +0200 Subject: [PATCH] Drop mysteryshack support It's been unmaintained for years, so no point in keeping track of compatibility. --- tests/storage/servers/mysteryshack/.gitignore | 1 - .../storage/servers/mysteryshack/__init__.py | 79 ------------------- tests/storage/servers/mysteryshack/install.sh | 18 ----- tests/storage/servers/mysteryshack/make.sh | 9 --- .../storage/servers/mysteryshack/variables.sh | 1 - 5 files changed, 108 deletions(-) delete mode 100644 tests/storage/servers/mysteryshack/.gitignore delete mode 100644 tests/storage/servers/mysteryshack/__init__.py delete mode 100644 tests/storage/servers/mysteryshack/install.sh delete mode 100644 tests/storage/servers/mysteryshack/make.sh delete mode 100644 tests/storage/servers/mysteryshack/variables.sh diff --git a/tests/storage/servers/mysteryshack/.gitignore b/tests/storage/servers/mysteryshack/.gitignore deleted file mode 100644 index 904d2ca..0000000 --- a/tests/storage/servers/mysteryshack/.gitignore +++ /dev/null @@ -1 +0,0 @@ -mysteryshack diff --git a/tests/storage/servers/mysteryshack/__init__.py b/tests/storage/servers/mysteryshack/__init__.py deleted file mode 100644 index c589535..0000000 --- a/tests/storage/servers/mysteryshack/__init__.py +++ /dev/null @@ -1,79 +0,0 @@ -import os -import shutil -import subprocess -import time - -import pytest -import requests - -testserver_repo = os.path.dirname(__file__) -make_sh = os.path.abspath(os.path.join(testserver_repo, "make.sh")) - - -def wait(): - for i in range(100): - try: - requests.get("http://127.0.0.1:6767/", verify=False) - except Exception as e: - # Don't know exact exception class, don't care. - # Also, https://github.com/kennethreitz/requests/issues/2192 - if "connection refused" not in str(e).lower(): - raise - time.sleep(2 ** i) - else: - return True - return False - - -class ServerMixin: - @pytest.fixture(scope="session") - def setup_mysteryshack_server(self, xprocess): - def preparefunc(cwd): - return wait, ["sh", make_sh, "testserver"] - - subprocess.check_call(["sh", make_sh, "testserver-config"]) - xprocess.ensure("mysteryshack_server", preparefunc) - - return ( - subprocess.check_output( - [ - os.path.join( - testserver_repo, "mysteryshack/target/debug/mysteryshack" - ), - "-c", - "/tmp/mysteryshack/config", - "user", - "authorize", - "testuser", - "https://example.com", - self.storage_class.scope + ":rw", - ] - ) - .strip() - .decode() - ) - - @pytest.fixture - def get_storage_args(self, monkeypatch, setup_mysteryshack_server): - from requests import Session - - monkeypatch.setitem(os.environ, "OAUTHLIB_INSECURE_TRANSPORT", "true") - - old_request = Session.request - - def request(self, method, url, **kw): - url = url.replace("https://", "http://") - return old_request(self, method, url, **kw) - - monkeypatch.setattr(Session, "request", request) - shutil.rmtree("/tmp/mysteryshack/testuser/data", ignore_errors=True) - shutil.rmtree("/tmp/mysteryshack/testuser/meta", ignore_errors=True) - - def inner(**kw): - kw["account"] = "testuser@127.0.0.1:6767" - kw["access_token"] = setup_mysteryshack_server - if self.storage_class.fileext == ".ics": - kw.setdefault("collection", "test") - return kw - - return inner diff --git a/tests/storage/servers/mysteryshack/install.sh b/tests/storage/servers/mysteryshack/install.sh deleted file mode 100644 index 36b1269..0000000 --- a/tests/storage/servers/mysteryshack/install.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -set -ex -cd "$(dirname "$0")" -. ./variables.sh - -if [ "$CI" = "true" ]; then - curl -sL https://static.rust-lang.org/rustup.sh -o ~/rust-installer/rustup.sh - sh ~/rust-installer/rustup.sh --prefix=~/rust --spec=stable -y --disable-sudo 2> /dev/null -fi - -if [ ! -d mysteryshack ]; then - git clone https://github.com/untitaker/mysteryshack -fi - -pip install pytest-xprocess - -cd mysteryshack -make debug-build # such that first test doesn't hang too long w/o output diff --git a/tests/storage/servers/mysteryshack/make.sh b/tests/storage/servers/mysteryshack/make.sh deleted file mode 100644 index c2484a4..0000000 --- a/tests/storage/servers/mysteryshack/make.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -set -e - -# pytest-xprocess doesn't allow us to CD into a particular directory before -# launching a command, so we do it here. -cd "$(dirname "$0")" -. ./variables.sh -cd mysteryshack -exec make "$@" diff --git a/tests/storage/servers/mysteryshack/variables.sh b/tests/storage/servers/mysteryshack/variables.sh deleted file mode 100644 index 8eda6e7..0000000 --- a/tests/storage/servers/mysteryshack/variables.sh +++ /dev/null @@ -1 +0,0 @@ -export PATH="$PATH:$HOME/.cargo/bin/"