Merge 1cedf93 into 5748edd

jbms · Dec 5, 2020 · be14c45 · be14c45
2 parents 5748edd + 1cedf93
commit be14c45
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/beancount_import/source/generic_importer_source_test.py b/beancount_import/source/generic_importer_source_test.py
@@ -9,6 +9,8 @@
     os.path.join(
         os.path.dirname(__file__), '..', '..', 'testdata', 'source', 'generic_importer'))
 
+testdata_csv = os.path.join(testdata_dir, "csv")
+
 examples = [
     'test_basic',
     'test_invalid',
@@ -31,7 +33,7 @@ def test_source(name: str):
         example_dir=os.path.join(testdata_dir, name),
         source_spec={
             'module': 'beancount_import.source.generic_importer_source',
-            'directory': testdata_dir,
+            'directory': testdata_csv,
             'account': 'Assets:Bank',
             'importer': importer,
         },

diff --git a/...ce/generic_importer/generic_statement.csv → ...eneric_importer/csv/generic_statement.csv b/...ce/generic_importer/generic_statement.csv → ...eneric_importer/csv/generic_statement.csv
diff --git a/testdata/source/generic_importer/test_basic/import_results.beancount b/testdata/source/generic_importer/test_basic/import_results.beancount
@@ -1,5 +1,5 @@
 ;; date: 2020-01-01
-;; info: {"filename": "<testdata>/generic_statement.csv", "line": 1, "type": "text/csv"}
+;; info: {"filename": "<testdata>/csv/generic_statement.csv", "line": 1, "type": "text/csv"}
 
 ; features: [
 ;             {
@@ -18,7 +18,7 @@
   Expenses:FIXME   1 USD
 
 ;; date: 2020-01-01
-;; info: {"filename": "<testdata>/generic_statement.csv", "line": 2, "type": "text/csv"}
+;; info: {"filename": "<testdata>/csv/generic_statement.csv", "line": 2, "type": "text/csv"}
 
 ; features: [
 ;             {
@@ -37,7 +37,7 @@
   Expenses:FIXME   1 USD
 
 ;; date: 2020-01-02
-;; info: {"filename": "<testdata>/generic_statement.csv", "line": 3, "type": "text/csv"}
+;; info: {"filename": "<testdata>/csv/generic_statement.csv", "line": 3, "type": "text/csv"}
 
 ; features: [
 ;             {
@@ -56,7 +56,7 @@
   Expenses:FIXME  -1 USD
 
 ;; date: 2020-01-02
-;; info: {"filename": "<testdata>/generic_statement.csv", "line": 5, "type": "text/csv"}
+;; info: {"filename": "<testdata>/csv/generic_statement.csv", "line": 5, "type": "text/csv"}
 
 ; features: [
 ;             {
@@ -75,7 +75,7 @@
   Expenses:FIXME  -1 USD
 
 ;; date: 2020-01-02
-;; info: {"filename": "<testdata>/generic_statement.csv", "line": 4, "type": "text/csv"}
+;; info: {"filename": "<testdata>/csv/generic_statement.csv", "line": 4, "type": "text/csv"}
 
 ; features: [
 ;             {
@@ -94,7 +94,7 @@
   Expenses:FIXME  -500 USD
 
 ;; date: 2020-01-05
-;; info: {"filename": "<testdata>/generic_statement.csv", "line": 6, "type": "text/csv"}
+;; info: {"filename": "<testdata>/csv/generic_statement.csv", "line": 6, "type": "text/csv"}
 
 ; features: [
 ;             {