From ebe1f1c2f02ffcef7b0f9d2a2a3ce5c974109a73 Mon Sep 17 00:00:00 2001 From: "Nicolas Bessi (nbessi)" Date: Wed, 2 Jul 2014 22:52:09 +0200 Subject: [PATCH 01/10] Create .travis.yml --- .travis.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..4fd2ec735 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,26 @@ +language: python +python: + - "2.7" + +virtualenv: + system_site_packages: true + +before_install: + - git clone https://github.com/gurneyalex/maintainer-quality-tools.git $HOME/maintainer-quality-tools + +env: + - PATH=$HOME/maintainer-quality-tools/travis:$PATH + +services: + - postgresql + +install: + - $HOME/maintainer-quality-tools/travis/travis_install_nightly 7.0 + - pip install coveralls flake8 + +script: + - travis_run_flake8 + - travis_run_tests 7.0 openerp_test + +after_success: + coveralls From 5ade497717c38c27f05397465168b4c2509fb397 Mon Sep 17 00:00:00 2001 From: "Nicolas Bessi (nbessi)" Date: Wed, 2 Jul 2014 23:05:16 +0200 Subject: [PATCH 02/10] Add depedency on connector repository --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4fd2ec735..a1e49f5be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ virtualenv: before_install: - git clone https://github.com/gurneyalex/maintainer-quality-tools.git $HOME/maintainer-quality-tools + - git clone https://github.com/OCA/connector $HOME/connector -b 7.0 env: - PATH=$HOME/maintainer-quality-tools/travis:$PATH @@ -20,7 +21,7 @@ install: script: - travis_run_flake8 - - travis_run_tests 7.0 openerp_test + - travis_run_tests 7.0 openerp_test $HOME/connector after_success: coveralls From 48c0dfc3f3784e6df925d615292fa2aeb77e2e74 Mon Sep 17 00:00:00 2001 From: Nicolas Bessi Date: Fri, 4 Jul 2014 09:47:15 +0200 Subject: [PATCH 03/10] Fix csv data of async_move_line_importer --- async_move_line_importer/tests/data/faulty_moves.csv | 6 +++--- async_move_line_importer/tests/data/one_move.csv | 2 +- async_move_line_importer/tests/data/one_move2.csv | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/async_move_line_importer/tests/data/faulty_moves.csv b/async_move_line_importer/tests/data/faulty_moves.csv index 5b619f323..37a6c7115 100644 --- a/async_move_line_importer/tests/data/faulty_moves.csv +++ b/async_move_line_importer/tests/data/faulty_moves.csv @@ -1,7 +1,7 @@ ref;date;period_id;journal_id;line_id / account_id;line_id / partner_id;line_id / name;line_id / debit;line_id / credit;line_id/tax_code_id -test_3;2013-10-01;X 01/2013;MISC;X2001;Camptocamp;TEST C2C;;1000;Tax Received +test_3;2014-10-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received ;;;;X11003;Camptocamp;TEST C2C;;200;Tax Paid ;;;;X11002;Camptocamp;TEST C2C;1200;; -test_3b;2013-10-01;X 01/2013;MISC;X2001;Camptocamp;TEST C2C;;1000;Tax Received +test_3b;2014-10-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received ;;;;X11003;Camptocamp;TEST C2C;;200;Faulty code -;;;;X11002;Camptocamp;TEST C2C;1200;; \ No newline at end of file +;;;;X11002;Camptocamp;TEST C2C;1200;; diff --git a/async_move_line_importer/tests/data/one_move.csv b/async_move_line_importer/tests/data/one_move.csv index 886f23db9..3724fc776 100644 --- a/async_move_line_importer/tests/data/one_move.csv +++ b/async_move_line_importer/tests/data/one_move.csv @@ -1,4 +1,4 @@ ref;date;period_id;journal_id;line_id / account_id;line_id / partner_id;line_id / name;line_id / debit;line_id / credit;line_id/tax_code_id -éöüàè_test_1;2013-10-01;X 01/2013;MISC;X2001;Camptocamp;TEST C2C;;1000;Tax Received +éöüàè_test_1;2014-10-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received ;;;;X11003;Camptocamp;TEST C2C;;200;Tax Paid ;;;;X11002;Camptocamp;TEST C2C;1200;; diff --git a/async_move_line_importer/tests/data/one_move2.csv b/async_move_line_importer/tests/data/one_move2.csv index df18b39d1..11f107ca6 100644 --- a/async_move_line_importer/tests/data/one_move2.csv +++ b/async_move_line_importer/tests/data/one_move2.csv @@ -1,4 +1,4 @@ ref;date;period_id;journal_id;line_id / account_id;line_id / partner_id;line_id / name;line_id / debit;line_id / credit;line_id/tax_code_id -test_2;2013-10-01;X 01/2013;MISC;X2001;Camptocamp;TEST C2C;;1000;Tax Received +test_2;2014-10-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received ;;;;X11003;Camptocamp;TEST C2C;;200;Tax Paid ;;;;X11002;Camptocamp;TEST C2C;1200;; From dd4f04086d58b025b259d8e06e2b7c0a2ee26c1c Mon Sep 17 00:00:00 2001 From: Nicolas Bessi Date: Fri, 4 Jul 2014 10:03:40 +0200 Subject: [PATCH 04/10] More coherent date in async_move_line importer tests --- async_move_line_importer/tests/data/faulty_moves.csv | 4 ++-- async_move_line_importer/tests/data/one_move.csv | 2 +- async_move_line_importer/tests/data/one_move2.csv | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/async_move_line_importer/tests/data/faulty_moves.csv b/async_move_line_importer/tests/data/faulty_moves.csv index 37a6c7115..4f794a7b4 100644 --- a/async_move_line_importer/tests/data/faulty_moves.csv +++ b/async_move_line_importer/tests/data/faulty_moves.csv @@ -1,7 +1,7 @@ ref;date;period_id;journal_id;line_id / account_id;line_id / partner_id;line_id / name;line_id / debit;line_id / credit;line_id/tax_code_id -test_3;2014-10-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received +test_3;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received ;;;;X11003;Camptocamp;TEST C2C;;200;Tax Paid ;;;;X11002;Camptocamp;TEST C2C;1200;; -test_3b;2014-10-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received +test_3b;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received ;;;;X11003;Camptocamp;TEST C2C;;200;Faulty code ;;;;X11002;Camptocamp;TEST C2C;1200;; diff --git a/async_move_line_importer/tests/data/one_move.csv b/async_move_line_importer/tests/data/one_move.csv index 3724fc776..9b0023e15 100644 --- a/async_move_line_importer/tests/data/one_move.csv +++ b/async_move_line_importer/tests/data/one_move.csv @@ -1,4 +1,4 @@ ref;date;period_id;journal_id;line_id / account_id;line_id / partner_id;line_id / name;line_id / debit;line_id / credit;line_id/tax_code_id -éöüàè_test_1;2014-10-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received +éöüàè_test_1;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received ;;;;X11003;Camptocamp;TEST C2C;;200;Tax Paid ;;;;X11002;Camptocamp;TEST C2C;1200;; diff --git a/async_move_line_importer/tests/data/one_move2.csv b/async_move_line_importer/tests/data/one_move2.csv index 11f107ca6..e8619bba8 100644 --- a/async_move_line_importer/tests/data/one_move2.csv +++ b/async_move_line_importer/tests/data/one_move2.csv @@ -1,4 +1,4 @@ ref;date;period_id;journal_id;line_id / account_id;line_id / partner_id;line_id / name;line_id / debit;line_id / credit;line_id/tax_code_id -test_2;2014-10-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received +test_2;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received ;;;;X11003;Camptocamp;TEST C2C;;200;Tax Paid ;;;;X11002;Camptocamp;TEST C2C;1200;; From 8e31395b6d3cc5ecf0adbe9df5b7047ebd605369 Mon Sep 17 00:00:00 2001 From: Nicolas Bessi Date: Fri, 4 Jul 2014 10:52:53 +0200 Subject: [PATCH 05/10] Fix asyn_move_line importer by removing deprecated taxe code --- async_move_line_importer/tests/data/faulty_moves.csv | 6 +++--- async_move_line_importer/tests/data/one_move.csv | 4 ++-- async_move_line_importer/tests/data/one_move2.csv | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/async_move_line_importer/tests/data/faulty_moves.csv b/async_move_line_importer/tests/data/faulty_moves.csv index 4f794a7b4..903eb1728 100644 --- a/async_move_line_importer/tests/data/faulty_moves.csv +++ b/async_move_line_importer/tests/data/faulty_moves.csv @@ -1,7 +1,7 @@ ref;date;period_id;journal_id;line_id / account_id;line_id / partner_id;line_id / name;line_id / debit;line_id / credit;line_id/tax_code_id -test_3;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received -;;;;X11003;Camptocamp;TEST C2C;;200;Tax Paid +test_3;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000; +;;;;X11003;Camptocamp;TEST C2C;;200;; ;;;;X11002;Camptocamp;TEST C2C;1200;; -test_3b;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received +test_3b;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000; ;;;;X11003;Camptocamp;TEST C2C;;200;Faulty code ;;;;X11002;Camptocamp;TEST C2C;1200;; diff --git a/async_move_line_importer/tests/data/one_move.csv b/async_move_line_importer/tests/data/one_move.csv index 9b0023e15..687839ddb 100644 --- a/async_move_line_importer/tests/data/one_move.csv +++ b/async_move_line_importer/tests/data/one_move.csv @@ -1,4 +1,4 @@ ref;date;period_id;journal_id;line_id / account_id;line_id / partner_id;line_id / name;line_id / debit;line_id / credit;line_id/tax_code_id -éöüàè_test_1;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received -;;;;X11003;Camptocamp;TEST C2C;;200;Tax Paid +éöüàè_test_1;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000; +;;;;X11003;Camptocamp;TEST C2C;;200;; ;;;;X11002;Camptocamp;TEST C2C;1200;; diff --git a/async_move_line_importer/tests/data/one_move2.csv b/async_move_line_importer/tests/data/one_move2.csv index e8619bba8..5f403b592 100644 --- a/async_move_line_importer/tests/data/one_move2.csv +++ b/async_move_line_importer/tests/data/one_move2.csv @@ -1,4 +1,4 @@ ref;date;period_id;journal_id;line_id / account_id;line_id / partner_id;line_id / name;line_id / debit;line_id / credit;line_id/tax_code_id -test_2;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000;Tax Received -;;;;X11003;Camptocamp;TEST C2C;;200;Tax Paid +test_2;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000; +;;;;X11003;Camptocamp;TEST C2C;;200;; ;;;;X11002;Camptocamp;TEST C2C;1200;; From 82676699c7d884ec7c9bd7c82dad430be9205383 Mon Sep 17 00:00:00 2001 From: Nicolas Bessi Date: Fri, 4 Jul 2014 11:17:35 +0200 Subject: [PATCH 06/10] Fix async_move_line test to have more explicit names --- async_move_line_importer/tests/data/faulty_moves.csv | 4 ++-- async_move_line_importer/tests/data/one_move.csv | 6 +++--- async_move_line_importer/tests/data/one_move2.csv | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/async_move_line_importer/tests/data/faulty_moves.csv b/async_move_line_importer/tests/data/faulty_moves.csv index 903eb1728..e1a3d3a85 100644 --- a/async_move_line_importer/tests/data/faulty_moves.csv +++ b/async_move_line_importer/tests/data/faulty_moves.csv @@ -1,7 +1,7 @@ ref;date;period_id;journal_id;line_id / account_id;line_id / partner_id;line_id / name;line_id / debit;line_id / credit;line_id/tax_code_id -test_3;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000; +test_3;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C1;;1000; ;;;;X11003;Camptocamp;TEST C2C;;200;; ;;;;X11002;Camptocamp;TEST C2C;1200;; -test_3b;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000; +test_3b;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C2;;1000; ;;;;X11003;Camptocamp;TEST C2C;;200;Faulty code ;;;;X11002;Camptocamp;TEST C2C;1200;; diff --git a/async_move_line_importer/tests/data/one_move.csv b/async_move_line_importer/tests/data/one_move.csv index 687839ddb..54085b700 100644 --- a/async_move_line_importer/tests/data/one_move.csv +++ b/async_move_line_importer/tests/data/one_move.csv @@ -1,4 +1,4 @@ ref;date;period_id;journal_id;line_id / account_id;line_id / partner_id;line_id / name;line_id / debit;line_id / credit;line_id/tax_code_id -éöüàè_test_1;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000; -;;;;X11003;Camptocamp;TEST C2C;;200;; -;;;;X11002;Camptocamp;TEST C2C;1200;; +éöüàè_test_1;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C4;;1000; +;;;;X11003;Camptocamp;TEST C2C5;;200;; +;;;;X11002;Camptocamp;TEST C2C6;1200;; diff --git a/async_move_line_importer/tests/data/one_move2.csv b/async_move_line_importer/tests/data/one_move2.csv index 5f403b592..bd2475160 100644 --- a/async_move_line_importer/tests/data/one_move2.csv +++ b/async_move_line_importer/tests/data/one_move2.csv @@ -1,4 +1,4 @@ ref;date;period_id;journal_id;line_id / account_id;line_id / partner_id;line_id / name;line_id / debit;line_id / credit;line_id/tax_code_id -test_2;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C;;1000; -;;;;X11003;Camptocamp;TEST C2C;;200;; -;;;;X11002;Camptocamp;TEST C2C;1200;; +test_2;2014-01-01;X 01/2014;Sales Journal - (test);X2001;Camptocamp;TEST C2C8;;1000; +;;;;X11003;Camptocamp;TEST C2C9;;200;; +;;;;X11002;Camptocamp;TEST C2C10;1200;; From 2c7605bb986d1e368ca70dc1dafc795c44fce114 Mon Sep 17 00:00:00 2001 From: "Nicolas Bessi (nbessi)" Date: Fri, 4 Jul 2014 11:59:39 +0200 Subject: [PATCH 07/10] POC use encapsulated test run --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a1e49f5be..36c23cc88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ virtualenv: system_site_packages: true before_install: - - git clone https://github.com/gurneyalex/maintainer-quality-tools.git $HOME/maintainer-quality-tools + - git clone https://github.com/nbessi/maintainer-quality-tools.git $HOME/maintainer-quality-tools - git clone https://github.com/OCA/connector $HOME/connector -b 7.0 env: @@ -21,7 +21,7 @@ install: script: - travis_run_flake8 - - travis_run_tests 7.0 openerp_test $HOME/connector + - travis_run_tests_encapsulated.sh 7.0 openerp_test $HOME/connector after_success: coveralls From 59e8c06f5c471827c86a0423ca6fb3191e8db30a Mon Sep 17 00:00:00 2001 From: "Nicolas Bessi (nbessi)" Date: Fri, 4 Jul 2014 14:33:10 +0200 Subject: [PATCH 08/10] Add root module for test --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 36c23cc88..37c6e26ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ install: script: - travis_run_flake8 - - travis_run_tests_encapsulated.sh 7.0 openerp_test $HOME/connector + - travis_run_tests_encapsulated.sh 7.0 openerp_test account $HOME/connector after_success: coveralls From 26a7b26eefbdbaf366a09f0e22953315c0fe8f59 Mon Sep 17 00:00:00 2001 From: "Nicolas Bessi (nbessi)" Date: Fri, 4 Jul 2014 15:14:54 +0200 Subject: [PATCH 09/10] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 37c6e26ba..663b5319f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,5 +23,6 @@ script: - travis_run_flake8 - travis_run_tests_encapsulated.sh 7.0 openerp_test account $HOME/connector +# Coverall must bi validated with encapsulated script after_success: coveralls From 11308a6942ac70676e1af1645c1091dcbb26f668 Mon Sep 17 00:00:00 2001 From: "Nicolas Bessi (nbessi)" Date: Fri, 4 Jul 2014 15:31:01 +0200 Subject: [PATCH 10/10] comment flake 8 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 663b5319f..aa37436eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,8 @@ install: - pip install coveralls flake8 script: - - travis_run_flake8 + #- travis_run_flake8 # will be done in a separated commit - travis_run_tests_encapsulated.sh 7.0 openerp_test account $HOME/connector -# Coverall must bi validated with encapsulated script after_success: coveralls