Skip to content

Commit

Permalink
Remove TEST_ARGS variables
Browse files Browse the repository at this point in the history
  • Loading branch information
raviqqe committed Dec 23, 2016
1 parent 461ffcb commit b74ae63
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 19 deletions.
13 changes: 7 additions & 6 deletions qnd/config_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
from . import config


TEST_ARGS = ["--master_host", "localhost:4242",
"--ps_hosts", "localhost:5151",
"--task_type", "master"]


def test_def_config():
test.initialize_argv(*TEST_ARGS)
append_argv()
assert isinstance(config.def_config()(), tf.contrib.learn.ClusterConfig)


def append_argv():
test.append_argv("--master_host", "localhost:4242",
"--ps_hosts", "localhost:5151",
"--task_type", "master")
4 changes: 2 additions & 2 deletions qnd/estimator_test.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import tensorflow as tf

from . import test
from .config_test import TEST_ARGS
from .config_test import append_argv
from .estimator import *


def test_def_estimator():
test.initialize_argv(*TEST_ARGS)
append_argv()
assert isinstance(def_estimator()(test.oracle_model, "output"),
tf.contrib.learn.Estimator)
assert isinstance(
Expand Down
10 changes: 6 additions & 4 deletions qnd/experiment_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@
from . import inputs_test


TEST_ARGS = [*estimator_test.TEST_ARGS, *inputs_test.TEST_ARGS]


def test_def_experiment():
test.initialize_argv(*TEST_ARGS)
append_argv()

def_experiment_fn = experiment.def_def_experiment_fn()
_assert_is_function(def_experiment_fn)
Expand All @@ -25,3 +22,8 @@ def test_def_experiment():

def _assert_is_function(obj):
assert isinstance(obj, types.FunctionType)


def append_argv():
estimator_test.append_argv()
inputs_test.append_argv()
8 changes: 6 additions & 2 deletions qnd/inputs_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@


_FILE_PATTERN = "*.md"
TEST_ARGS = ["--train_file", _FILE_PATTERN, "--eval_file", _FILE_PATTERN]


def test_def_input_fn():
test.initialize_argv(*TEST_ARGS)
append_argv()

for def_input_fn in [inputs.def_def_train_input_fn(),
inputs.def_def_eval_input_fn()]:
Expand All @@ -35,3 +34,8 @@ def test_def_input_fn():
def _assert_are_instances(objects, klass):
for obj in objects:
assert isinstance(obj, klass)


def append_argv():
test.append_argv("--train_file", _FILE_PATTERN,
"--eval_file", _FILE_PATTERN)
5 changes: 2 additions & 3 deletions qnd/run_test.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import types

from . import test
from .experiment_test import TEST_ARGS
from .experiment_test import append_argv
from . import run


def test_def_run():
test.initialize_argv(TEST_ARGS)
append_argv()
assert isinstance(run.def_run(), types.FunctionType)
9 changes: 7 additions & 2 deletions qnd/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,10 @@ def user_input_fn(filename_queue):
return {"x": x}, {"y": x}


def initialize_argv(*args):
sys.argv = [sys.argv[0], *args]
def append_argv(*args):
command = "THIS_SHOULD_NEVER_MATCH"

if sys.argv[0] != command:
sys.argv = [command]

sys.argv += [*args]

0 comments on commit b74ae63

Please sign in to comment.