summaryrefslogtreecommitdiff
path: root/test/setup.rb
diff options
context:
space:
mode:
authorMicha Rautenberg <rautenberg@in-silico.ch>2015-10-30 12:07:45 +0100
committerMicha Rautenberg <rautenberg@in-silico.ch>2015-10-30 12:07:45 +0100
commit04d910a28ee46a7598f7b2db65f15f3885f935ae (patch)
tree2ce92ff1deae6ff7e24a385a28ed107ca57cc362 /test/setup.rb
parentf8e58e6bc7f101dfe07509751f0943918f19a082 (diff)
Test: expand descriptor tests and request setup from lazar test for datadir
Diffstat (limited to 'test/setup.rb')
-rw-r--r--test/setup.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/setup.rb b/test/setup.rb
index 91b8484..0ca77c6 100644
--- a/test/setup.rb
+++ b/test/setup.rb
@@ -1,6 +1,7 @@
require 'minitest/autorun'
require_relative '../../lazar/lib/lazar.rb'
+require_relative '../../lazar/test/setup.rb'
include OpenTox
-TEST_DIR ||= File.expand_path(File.dirname(__FILE__))
-DATA_DIR ||= File.join(TEST_DIR,"data")
+REST_TEST_DIR ||= File.expand_path(File.dirname(__FILE__))
+REST_DATA_DIR ||= File.join(REST_TEST_DIR,"data")