From 24ed8431b25413cb07cc740a3c21d5f658ca2bad Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Tue, 8 Mar 2016 21:17:51 -0800
Subject: [PATCH] move 'check-memory' from Makefile into tox.ini

So use 'tox -e check-memory' instead of 'make check-memory'. The tox
version will create a virtualenv and install tahoe for you before
running the tests, removing one use of the 'tahoe @FILENAME' hack (which
was used to run a python file with a PYTHONPATH set to import tahoe's
dependencies).
---
 .gitignore |  1 +
 Makefile   | 16 ----------------
 tox.ini    | 13 +++++++++++++
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6ce036fd3..864e7019b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ zope.interface-*.egg
 .pc
 
 /_trial_temp*
+/_test_memory/
 /tmp*
 /*.patch
 /dist/
diff --git a/Makefile b/Makefile
index 89e2b41b6..5794400cb 100644
--- a/Makefile
+++ b/Makefile
@@ -166,22 +166,6 @@ count-lines:
 	@echo -n "XXX: "
 	@grep XXX `find src -name '*.py' |grep -v /build/` | wc -l
 
-.PHONY: check-memory
-check-memory: .built
-	rm -rf _test_memory
-	$(TAHOE) @src/allmydata/test/check_memory.py upload
-	$(TAHOE) @src/allmydata/test/check_memory.py upload-self
-	$(TAHOE) @src/allmydata/test/check_memory.py upload-POST
-	$(TAHOE) @src/allmydata/test/check_memory.py download
-	$(TAHOE) @src/allmydata/test/check_memory.py download-GET
-	$(TAHOE) @src/allmydata/test/check_memory.py download-GET-slow
-	$(TAHOE) @src/allmydata/test/check_memory.py receive
-
-.PHONY: check-memory-once
-check-memory-once: .built
-	rm -rf _test_memory
-	$(TAHOE) @src/allmydata/test/check_memory.py $(MODE)
-
 # The check-speed target uses a pre-established client node to run a canned
 # set of performance tests against a test network that is also
 # pre-established (probably on a remote machine). Provide it with the path to
diff --git a/tox.ini b/tox.ini
index 8ba075b7f..1c118be15 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,3 +28,16 @@ commands =
          python setup.py update_version
          python setup.py make_executable
          trial --rterrors allmydata
+
+[testenv:checkmemory]
+commands =
+         python setup.py update_version
+         python setup.py make_executable
+         rm -rf _test_memory
+         python src/allmydata/test/check_memory.py upload
+         python src/allmydata/test/check_memory.py upload-self
+         python src/allmydata/test/check_memory.py upload-POST
+         python src/allmydata/test/check_memory.py download
+         python src/allmydata/test/check_memory.py download-GET
+         python src/allmydata/test/check_memory.py download-GET-slow
+         python src/allmydata/test/check_memory.py receive