aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzlg <zlg@zlg.space>2018-10-10 21:29:08 -0700
committerzlg <zlg@zlg.space>2018-10-10 21:29:08 -0700
commit8775fcd12876f3acc5f9b919afe1cf3be238a186 (patch)
treee4f03d17a7a8db01cdf20f67a8581e84e4695772
parentcli: Add "export" command (diff)
downloadvgstash-8775fcd12876f3acc5f9b919afe1cf3be238a186.tar.gz
vgstash-8775fcd12876f3acc5f9b919afe1cf3be238a186.tar.bz2
vgstash-8775fcd12876f3acc5f9b919afe1cf3be238a186.tar.xz
vgstash-8775fcd12876f3acc5f9b919afe1cf3be238a186.zip
Move tests and data to dedicated directory
Also tweaked the export command to report correctly.
Diffstat (limited to '')
-rw-r--r--.gitignore1
-rwxr-xr-xsetup.py3
-rw-r--r--src/vgstash_cli.py2
-rw-r--r--tests/data/test_import.yml16
-rw-r--r--tests/test_vgstash.py (renamed from src/vgstash/test_vgstash.py)0
-rw-r--r--tests/test_vgstash_cli.py (renamed from src/vgstash/test_vgstash_cli.py)12
-rw-r--r--tox.ini2
7 files changed, 26 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 4775e15..da6c42f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ __pycache__/
/dist/
.vgstash.db
+tests/data/test_export.*
diff --git a/setup.py b/setup.py
index f2f16d1..11c37fa 100755
--- a/setup.py
+++ b/setup.py
@@ -28,9 +28,8 @@ setup(
},
install_requires=[
'Click>=6.0', # for better Windows console support
- 'PyYAML', # importing from YAML files
+ 'PyYAML', # import/export YAML files
],
- #py_modules=["vgstash"],
classifiers=(
"Development Status :: 2 - Pre-Alpha",
"License :: OSI Approved :: GNU Affero General Public License v3",
diff --git a/src/vgstash_cli.py b/src/vgstash_cli.py
index 72a751a..17fd301 100644
--- a/src/vgstash_cli.py
+++ b/src/vgstash_cli.py
@@ -270,5 +270,5 @@ def export_file(format, filepath):
with open(filepath, "w") as fp:
yaml.dump(game_set, fp, default_flow_style=False,
indent=4, allow_unicode=True)
- click.echo("Successfully exported 6 games to {}.".format(os.path.join(os.getcwd(), "test_export.yml")))
+ click.echo("Successfully exported {} games to {}.".format(len(game_set), filepath))
diff --git a/tests/data/test_import.yml b/tests/data/test_import.yml
new file mode 100644
index 0000000..eb93579
--- /dev/null
+++ b/tests/data/test_import.yml
@@ -0,0 +1,16 @@
+# vgstash DB file version 0.2
+- ownership: 1
+ progress: 3
+ system: NES
+ title: Super Mario Bros.
+ notes: ''
+- ownership: 2
+ progress: 4
+ system: 3DS
+ title: The Legend of Zelda
+ notes: ''
+- ownership: 2
+ progress: 3
+ system: WiiU
+ title: Super Smash Bros for WiiU
+ notes: ''
diff --git a/src/vgstash/test_vgstash.py b/tests/test_vgstash.py
index 74f3c43..74f3c43 100644
--- a/src/vgstash/test_vgstash.py
+++ b/tests/test_vgstash.py
diff --git a/src/vgstash/test_vgstash_cli.py b/tests/test_vgstash_cli.py
index 098c39e..f81d119 100644
--- a/src/vgstash/test_vgstash_cli.py
+++ b/tests/test_vgstash_cli.py
@@ -219,11 +219,11 @@ def test_notes_edit():
def test_import_file_yaml():
runner = CliRunner()
- result = runner.invoke(vgstash_cli.cli, ["import", "test_import.yml"])
+ result = runner.invoke(vgstash_cli.cli, ["import", "tests/data/test_import.yml"])
if verbose:
print(result.output)
assert result.exit_code == 0
- assert result.output == "Successfully imported 2 games from {}.\n".format(os.path.join(os.getcwd(), "test_import.yml"))
+ assert result.output == "Successfully imported 2 games from {}.\n".format(os.path.join(os.getcwd(), "tests/data/test_import.yml"))
# List the results to make sure they match what the editor has.
list_runner = CliRunner()
@@ -235,11 +235,11 @@ def test_import_file_yaml():
def test_import_file_yaml_update():
runner = CliRunner()
- result = runner.invoke(vgstash_cli.cli, ["import", "test_import.yml", "-u"])
+ result = runner.invoke(vgstash_cli.cli, ["import", "tests/data/test_import.yml", "-u"])
if verbose:
print(result.output)
assert result.exit_code == 0
- assert result.output == "Successfully imported 3 games from {}.\n".format(os.path.join(os.getcwd(), "test_import.yml"))
+ assert result.output == "Successfully imported 3 games from {}.\n".format(os.path.join(os.getcwd(), "tests/data/test_import.yml"))
# List the results to make sure they match what the editor has.
list_runner = CliRunner()
@@ -251,8 +251,8 @@ def test_import_file_yaml_update():
def test_export_file_yaml():
runner = CliRunner()
- result = runner.invoke(vgstash_cli.cli, ["export", "-f", "yaml", "test_export.yml"])
+ result = runner.invoke(vgstash_cli.cli, ["export", "-f", "yaml", "tests/data/test_export.yml"])
if verbose:
print(result.output)
assert result.exit_code == 0
- assert result.output == "Successfully exported 6 games to {}.\n".format(os.path.join(os.getcwd(), "test_export.yml"))
+ assert result.output == "Successfully exported 6 games to {}.\n".format(os.path.join(os.getcwd(), "tests/data/test_export.yml"))
diff --git a/tox.ini b/tox.ini
index 9b397b2..f0b7805 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,4 +10,4 @@ envlist = py36
deps =
pytest
commands =
- pytest -svv
+ pytest -svv --rootdir=tests/