From 3d9b5b9924db9427cda67bdef5560c03da30b4d2 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 14:57:25 -0500 Subject: [PATCH 1/8] empty commit From 3eaf128e57471171217950b8b56c9b829c95d1c1 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 16:13:27 -0500 Subject: [PATCH 2/8] tap Signed-off-by: Kenneth Reitz --- run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.sh b/run-tests.sh index 9a21c9e5..6731e550 100644 --- a/run-tests.sh +++ b/run-tests.sh @@ -21,4 +21,4 @@ if [[ ! -z "$CI" ]]; then pipenv install --deploy --system --dev fi -pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream \ No newline at end of file +pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream | tee report.tap \ No newline at end of file From 3720fba71aa4c98857f5ab39db5f7a1a16cca1ea Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 16:23:26 -0500 Subject: [PATCH 3/8] empty commit From 1ff7ca3a3f46fead2b17a59e0a5c7c447f1694e3 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 16:28:18 -0500 Subject: [PATCH 4/8] run-tests Signed-off-by: Kenneth Reitz --- run-tests.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/run-tests.sh b/run-tests.sh index 6731e550..b17a54bf 100644 --- a/run-tests.sh +++ b/run-tests.sh @@ -19,6 +19,13 @@ if [[ ! -z "$CI" ]]; then echo "Installing Pipenv…" pip install -e . --upgrade --upgrade-strategy=only-if-needed pipenv install --deploy --system --dev +else + echo "Using RAM disk (assuming OS X)…" + diskutil erasevolume HFS+ 'RAM Disk' $(hdiutil attach -nomount ram://8388608) + RAM_DISK="/Volumes/RAM Disk" + export RAM_DISK + + pipenv install --dev fi pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream | tee report.tap \ No newline at end of file From 278d51b0a061b15f8a907b1b8f003d1bc0e45537 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 16:29:13 -0500 Subject: [PATCH 5/8] no space Signed-off-by: Kenneth Reitz --- run-tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 run-tests.sh diff --git a/run-tests.sh b/run-tests.sh old mode 100644 new mode 100755 index b17a54bf..b8e39610 --- a/run-tests.sh +++ b/run-tests.sh @@ -21,8 +21,8 @@ if [[ ! -z "$CI" ]]; then pipenv install --deploy --system --dev else echo "Using RAM disk (assuming OS X)…" - diskutil erasevolume HFS+ 'RAM Disk' $(hdiutil attach -nomount ram://8388608) - RAM_DISK="/Volumes/RAM Disk" + diskutil erasevolume HFS+ 'RAMDisk' $(hdiutil attach -nomount ram://8388608) + RAM_DISK="/Volumes/RAMDisk" export RAM_DISK pipenv install --dev From e0746bf52052adb152b39356b3c0b73d8a2c85a5 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 16:30:07 -0500 Subject: [PATCH 6/8] ignore report.tap Signed-off-by: Kenneth Reitz --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 6cee33ee..34a968c1 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ test_project /test/ /results.tap + +/report.tap From fc00978babace91289dad7389ab133961feda116 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 16:30:37 -0500 Subject: [PATCH 7/8] macos Signed-off-by: Kenneth Reitz --- run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.sh b/run-tests.sh index b8e39610..c34164ce 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -20,7 +20,7 @@ if [[ ! -z "$CI" ]]; then pip install -e . --upgrade --upgrade-strategy=only-if-needed pipenv install --deploy --system --dev else - echo "Using RAM disk (assuming OS X)…" + echo "Using RAM disk (assuming MacOS)…" diskutil erasevolume HFS+ 'RAMDisk' $(hdiutil attach -nomount ram://8388608) RAM_DISK="/Volumes/RAMDisk" export RAM_DISK From 805569eb4f6f901b0d864f233e568678ca1fc4a7 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 5 Mar 2018 16:30:57 -0500 Subject: [PATCH 8/8] cleanups Signed-off-by: Kenneth Reitz --- run-tests.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/run-tests.sh b/run-tests.sh index c34164ce..5cf739e2 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -17,11 +17,15 @@ if [[ ! -z "$CI" ]]; then export RAM_DISK echo "Installing Pipenv…" + pip install -e . --upgrade --upgrade-strategy=only-if-needed pipenv install --deploy --system --dev + else + echo "Using RAM disk (assuming MacOS)…" diskutil erasevolume HFS+ 'RAMDisk' $(hdiutil attach -nomount ram://8388608) + RAM_DISK="/Volumes/RAMDisk" export RAM_DISK