[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-11-30 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394396 )

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

36d3440 Fix logging for duplicate subscr_cancel

Change-Id: I3721b1751e861c472b1feeabb9e017de126e99f5
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/394396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3721b1751e861c472b1feeabb9e017de126e99f5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-11-30 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394396 )

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

36d3440 Fix logging for duplicate subscr_cancel

Change-Id: I3721b1751e861c472b1feeabb9e017de126e99f5
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/96/394396/1


-- 
To view, visit https://gerrit.wikimedia.org/r/394396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3721b1751e861c472b1feeabb9e017de126e99f5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-11-29 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394233 )

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

d614cfd Check for duplicate subscr_cancel
584db6a Flake8 - do not use bare except
3f59aa4 Export civicrm_contact.hash to silverpop
f904c68 git.wikimedia.org -> phab
5eaa838 Prefer Civi address to contribution_tracking for country

Change-Id: I2265beffe4ea803e19b3fcf4986704cfdb1a56ec
---
D silverpop_export/tests/minimal_schema.sql
D silverpop_export/tests/test_update.py
2 files changed, 0 insertions(+), 479 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/silverpop_export/tests/minimal_schema.sql 
b/silverpop_export/tests/minimal_schema.sql
deleted file mode 100644
index 4062e81..000
--- a/silverpop_export/tests/minimal_schema.sql
+++ /dev/null
@@ -1,134 +0,0 @@
-<<< HEAD   (6d4b6f Merge branch 'master' into deploy)
-===
--- TODO: Do something SQLy to make *sure* we're not in a real database.
-
-drop table if exists civicrm_email;
-create table civicrm_email (
-id int(10) unsigned auto_increment primary key,
-contact_id int(10) unsigned,
-email varchar(254) COLLATE utf8_unicode_ci,
-is_primary tinyint(4) default '1',
-on_hold tinyint(4) default '0',
-key UI_email (email)
-);
-
-drop table if exists civicrm_contact;
-create table civicrm_contact (
-id int(10) unsigned auto_increment primary key,
-do_not_email tinyint(4) default '0',
-do_not_phone tinyint(4) default '0',
-do_not_mail tinyint(4) default '0',
-do_not_sms tinyint(4) default '0',
-do_not_trade tinyint(4) default '1',
-is_opt_out tinyint(4) default '0',
-preferred_language varchar(32) COLLATE utf8_unicode_ci,
-hash varchar(32) COLLATE utf8_unicode_ci,
-first_name varchar(64) COLLATE utf8_unicode_ci,
-middle_name varchar(64) COLLATE utf8_unicode_ci,
-last_name varchar(64) COLLATE utf8_unicode_ci,
-is_deleted tinyint(4) default '0'
-);
-
-drop table if exists civicrm_currency;
-create table civicrm_currency (
-id int(10) unsigned auto_increment primary key,
-name varchar(64) COLLATE utf8_unicode_ci,
-symbol varchar(8) COLLATE utf8_unicode_ci,
-key UI_name (name)
-);
-insert into civicrm_currency (name, symbol)
-values
-('USD', '$'),
-('CAD', '$'),
-('GBP', '£'),
-('DZD', NULL);
-
-drop table if exists wmf_donor;
-create table wmf_donor (
-id int(10) unsigned,
-entity_id int(10) unsigned,
-do_not_solicit tinyint(4),
-is_2006_donor tinyint(4),
-is_2007_donor tinyint(4),
-is_2008_donor tinyint(4),
-is_2009_donor tinyint(4),
-is_2010_donor tinyint(4),
-is_2011_donor tinyint(4),
-is_2012_donor tinyint(4),
-is_2013_donor tinyint(4),
-is_2014_donor tinyint(4),
-is_2015_donor tinyint(4),
-is_2016_donor tinyint(4),
-is_2017_donor tinyint(4),
-is_2018_donor tinyint(4),
-is_2019_donor tinyint(4),
-is_2020_donor tinyint(4),
-is_2021_donor tinyint(4),
-is_2022_donor tinyint(4),
-is_2023_donor tinyint(4),
-is_2024_donor tinyint(4),
-is_2025_donor tinyint(4),
-last_donation_date datetime,
-last_donation_currency varchar(255) COLLATE utf8_unicode_ci,
-last_donation_amount decimal(20,2),
-last_donation_usd decimal(20,2),
-lifetime_usd_total decimal(20,2)
-);
-
-drop table if exists civicrm_contribution;
-create table civicrm_contribution (
-id int(10) unsigned,
-contact_id int(10) unsigned,
-receive_date datetime,
-total_amount decimal(20,2),
-trxn_id varchar(255) COLLATE utf8_unicode_ci,
-contribution_status_id int(10) unsigned
-);
-
-drop table if exists civicrm_address;
-create table civicrm_address (
-id int(10) unsigned auto_increment primary key,
-contact_id int(10) unsigned,
-is_primary tinyint(4),
-city varchar(64) COLLATE utf8_unicode_ci,
-postal_code varchar(64) COLLATE utf8_unicode_ci,
-country_id int(10) unsigned,
-state_province_id int(10) unsigned,
-timezone varchar(8) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_country;
-create table civicrm_country (
-id int(10) unsigned,
-iso_code char(2) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_state_province;
-create table civicrm_state_province (
-  id int(10) unsigned,
-  name varchar(64) COLLATE utf8_unicode_ci
-);
-
-drop table if exists wmf_contribution_extra;
-create table wmf_contribution_extra (
-entity_id int(10) unsigned,
-original_amount decimal(20,2),
-original_currency varchar(255) COLLATE utf8_unicode_ci
-);
-
-drop table if exists contribution_tracking;
-create table contribution_tracking (
-contribution_id int(10) unsigned,
-country varchar(2)
-);
-
-drop table if exists log_civicrm_email;
-create table log_civicrm_email (
-email varchar(254)

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-11-29 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394233 )

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

d614cfd Check for duplicate subscr_cancel
584db6a Flake8 - do not use bare except
3f59aa4 Export civicrm_contact.hash to silverpop
f904c68 git.wikimedia.org -> phab
5eaa838 Prefer Civi address to contribution_tracking for country

Change-Id: I2265beffe4ea803e19b3fcf4986704cfdb1a56ec
---
D silverpop_export/tests/minimal_schema.sql
D silverpop_export/tests/test_update.py
2 files changed, 0 insertions(+), 479 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/33/394233/1

diff --git a/silverpop_export/tests/minimal_schema.sql 
b/silverpop_export/tests/minimal_schema.sql
deleted file mode 100644
index 4062e81..000
--- a/silverpop_export/tests/minimal_schema.sql
+++ /dev/null
@@ -1,134 +0,0 @@
-<<< HEAD   (6d4b6f Merge branch 'master' into deploy)
-===
--- TODO: Do something SQLy to make *sure* we're not in a real database.
-
-drop table if exists civicrm_email;
-create table civicrm_email (
-id int(10) unsigned auto_increment primary key,
-contact_id int(10) unsigned,
-email varchar(254) COLLATE utf8_unicode_ci,
-is_primary tinyint(4) default '1',
-on_hold tinyint(4) default '0',
-key UI_email (email)
-);
-
-drop table if exists civicrm_contact;
-create table civicrm_contact (
-id int(10) unsigned auto_increment primary key,
-do_not_email tinyint(4) default '0',
-do_not_phone tinyint(4) default '0',
-do_not_mail tinyint(4) default '0',
-do_not_sms tinyint(4) default '0',
-do_not_trade tinyint(4) default '1',
-is_opt_out tinyint(4) default '0',
-preferred_language varchar(32) COLLATE utf8_unicode_ci,
-hash varchar(32) COLLATE utf8_unicode_ci,
-first_name varchar(64) COLLATE utf8_unicode_ci,
-middle_name varchar(64) COLLATE utf8_unicode_ci,
-last_name varchar(64) COLLATE utf8_unicode_ci,
-is_deleted tinyint(4) default '0'
-);
-
-drop table if exists civicrm_currency;
-create table civicrm_currency (
-id int(10) unsigned auto_increment primary key,
-name varchar(64) COLLATE utf8_unicode_ci,
-symbol varchar(8) COLLATE utf8_unicode_ci,
-key UI_name (name)
-);
-insert into civicrm_currency (name, symbol)
-values
-('USD', '$'),
-('CAD', '$'),
-('GBP', '£'),
-('DZD', NULL);
-
-drop table if exists wmf_donor;
-create table wmf_donor (
-id int(10) unsigned,
-entity_id int(10) unsigned,
-do_not_solicit tinyint(4),
-is_2006_donor tinyint(4),
-is_2007_donor tinyint(4),
-is_2008_donor tinyint(4),
-is_2009_donor tinyint(4),
-is_2010_donor tinyint(4),
-is_2011_donor tinyint(4),
-is_2012_donor tinyint(4),
-is_2013_donor tinyint(4),
-is_2014_donor tinyint(4),
-is_2015_donor tinyint(4),
-is_2016_donor tinyint(4),
-is_2017_donor tinyint(4),
-is_2018_donor tinyint(4),
-is_2019_donor tinyint(4),
-is_2020_donor tinyint(4),
-is_2021_donor tinyint(4),
-is_2022_donor tinyint(4),
-is_2023_donor tinyint(4),
-is_2024_donor tinyint(4),
-is_2025_donor tinyint(4),
-last_donation_date datetime,
-last_donation_currency varchar(255) COLLATE utf8_unicode_ci,
-last_donation_amount decimal(20,2),
-last_donation_usd decimal(20,2),
-lifetime_usd_total decimal(20,2)
-);
-
-drop table if exists civicrm_contribution;
-create table civicrm_contribution (
-id int(10) unsigned,
-contact_id int(10) unsigned,
-receive_date datetime,
-total_amount decimal(20,2),
-trxn_id varchar(255) COLLATE utf8_unicode_ci,
-contribution_status_id int(10) unsigned
-);
-
-drop table if exists civicrm_address;
-create table civicrm_address (
-id int(10) unsigned auto_increment primary key,
-contact_id int(10) unsigned,
-is_primary tinyint(4),
-city varchar(64) COLLATE utf8_unicode_ci,
-postal_code varchar(64) COLLATE utf8_unicode_ci,
-country_id int(10) unsigned,
-state_province_id int(10) unsigned,
-timezone varchar(8) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_country;
-create table civicrm_country (
-id int(10) unsigned,
-iso_code char(2) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_state_province;
-create table civicrm_state_province (
-  id int(10) unsigned,
-  name varchar(64) COLLATE utf8_unicode_ci
-);
-
-drop table if exists wmf_contribution_extra;
-create table wmf_contribution_extra (
-entity_id int(10) unsigned,
-original_amount decimal(20,2),
-original_currency varchar(255) COLLATE utf8_unicode_ci
-);
-
-drop table if exists contribution_tracking;
-create table contribution_tracking (
-contribution_id int(10) unsigned,
-country varchar(2)
-);
-
-drop table if exists log_civicrm_email;
-create table log_civicrm_email (
-email

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-09-28 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/381367 )

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

bce4030 Add lastet_currency_symbol to export

Change-Id: I80d8ed100cf1ad3fe3403520562cf96ebd38813b
---
D silverpop_export/tests/minimal_schema.sql
D silverpop_export/tests/test_update.py
2 files changed, 0 insertions(+), 427 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/silverpop_export/tests/minimal_schema.sql 
b/silverpop_export/tests/minimal_schema.sql
deleted file mode 100644
index dc47786..000
--- a/silverpop_export/tests/minimal_schema.sql
+++ /dev/null
@@ -1,133 +0,0 @@
-<<< HEAD   (69a962 Merge branch 'master' into deploy)
-===
--- TODO: Do something SQLy to make *sure* we're not in a real database.
-
-drop table if exists civicrm_email;
-create table civicrm_email (
-id int(10) unsigned auto_increment primary key,
-contact_id int(10) unsigned,
-email varchar(254) COLLATE utf8_unicode_ci,
-is_primary tinyint(4) default '1',
-on_hold tinyint(4) default '0',
-key UI_email (email)
-);
-
-drop table if exists civicrm_contact;
-create table civicrm_contact (
-id int(10) unsigned auto_increment primary key,
-do_not_email tinyint(4) default '0',
-do_not_phone tinyint(4) default '0',
-do_not_mail tinyint(4) default '0',
-do_not_sms tinyint(4) default '0',
-do_not_trade tinyint(4) default '1',
-is_opt_out tinyint(4) default '0',
-preferred_language varchar(32) COLLATE utf8_unicode_ci,
-first_name varchar(64) COLLATE utf8_unicode_ci,
-middle_name varchar(64) COLLATE utf8_unicode_ci,
-last_name varchar(64) COLLATE utf8_unicode_ci,
-is_deleted tinyint(4) default '0'
-);
-
-drop table if exists civicrm_currency;
-create table civicrm_currency (
-id int(10) unsigned auto_increment primary key,
-name varchar(64) COLLATE utf8_unicode_ci,
-symbol varchar(8) COLLATE utf8_unicode_ci,
-key UI_name (name)
-);
-insert into civicrm_currency (name, symbol)
-values
-('USD', '$'),
-('CAD', '$'),
-('GBP', '£'),
-('DZD', NULL);
-
-drop table if exists wmf_donor;
-create table wmf_donor (
-id int(10) unsigned,
-entity_id int(10) unsigned,
-do_not_solicit tinyint(4),
-is_2006_donor tinyint(4),
-is_2007_donor tinyint(4),
-is_2008_donor tinyint(4),
-is_2009_donor tinyint(4),
-is_2010_donor tinyint(4),
-is_2011_donor tinyint(4),
-is_2012_donor tinyint(4),
-is_2013_donor tinyint(4),
-is_2014_donor tinyint(4),
-is_2015_donor tinyint(4),
-is_2016_donor tinyint(4),
-is_2017_donor tinyint(4),
-is_2018_donor tinyint(4),
-is_2019_donor tinyint(4),
-is_2020_donor tinyint(4),
-is_2021_donor tinyint(4),
-is_2022_donor tinyint(4),
-is_2023_donor tinyint(4),
-is_2024_donor tinyint(4),
-is_2025_donor tinyint(4),
-last_donation_date datetime,
-last_donation_currency varchar(255) COLLATE utf8_unicode_ci,
-last_donation_amount decimal(20,2),
-last_donation_usd decimal(20,2),
-lifetime_usd_total decimal(20,2)
-);
-
-drop table if exists civicrm_contribution;
-create table civicrm_contribution (
-id int(10) unsigned,
-contact_id int(10) unsigned,
-receive_date datetime,
-total_amount decimal(20,2),
-trxn_id varchar(255) COLLATE utf8_unicode_ci,
-contribution_status_id int(10) unsigned
-);
-
-drop table if exists civicrm_address;
-create table civicrm_address (
-id int(10) unsigned auto_increment primary key,
-contact_id int(10) unsigned,
-is_primary tinyint(4),
-city varchar(64) COLLATE utf8_unicode_ci,
-postal_code varchar(64) COLLATE utf8_unicode_ci,
-country_id int(10) unsigned,
-state_province_id int(10) unsigned,
-timezone varchar(8) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_country;
-create table civicrm_country (
-id int(10) unsigned,
-iso_code char(2) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_state_province;
-create table civicrm_state_province (
-  id int(10) unsigned,
-  name varchar(64) COLLATE utf8_unicode_ci
-);
-
-drop table if exists wmf_contribution_extra;
-create table wmf_contribution_extra (
-entity_id int(10) unsigned,
-original_amount decimal(20,2),
-original_currency varchar(255) COLLATE utf8_unicode_ci
-);
-
-drop table if exists contribution_tracking;
-create table contribution_tracking (
-contribution_id int(10) unsigned,
-country varchar(2)
-);
-
-drop table if exists log_civicrm_email;
-create table log_civicrm_email (
-email varchar(254) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_uf_match;
-create table civicrm_uf_match (
-uf_name varchar(128) COLLATE utf8_unicode_ci
-);
->>> BRANCH (bce403 Add lastet_currency_symbol to export)
diff --git

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-09-28 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381367 )

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

bce4030 Add lastet_currency_symbol to export

Change-Id: I80d8ed100cf1ad3fe3403520562cf96ebd38813b
---
D silverpop_export/tests/minimal_schema.sql
D silverpop_export/tests/test_update.py
2 files changed, 0 insertions(+), 427 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/67/381367/1

diff --git a/silverpop_export/tests/minimal_schema.sql 
b/silverpop_export/tests/minimal_schema.sql
deleted file mode 100644
index dc47786..000
--- a/silverpop_export/tests/minimal_schema.sql
+++ /dev/null
@@ -1,133 +0,0 @@
-<<< HEAD   (69a962 Merge branch 'master' into deploy)
-===
--- TODO: Do something SQLy to make *sure* we're not in a real database.
-
-drop table if exists civicrm_email;
-create table civicrm_email (
-id int(10) unsigned auto_increment primary key,
-contact_id int(10) unsigned,
-email varchar(254) COLLATE utf8_unicode_ci,
-is_primary tinyint(4) default '1',
-on_hold tinyint(4) default '0',
-key UI_email (email)
-);
-
-drop table if exists civicrm_contact;
-create table civicrm_contact (
-id int(10) unsigned auto_increment primary key,
-do_not_email tinyint(4) default '0',
-do_not_phone tinyint(4) default '0',
-do_not_mail tinyint(4) default '0',
-do_not_sms tinyint(4) default '0',
-do_not_trade tinyint(4) default '1',
-is_opt_out tinyint(4) default '0',
-preferred_language varchar(32) COLLATE utf8_unicode_ci,
-first_name varchar(64) COLLATE utf8_unicode_ci,
-middle_name varchar(64) COLLATE utf8_unicode_ci,
-last_name varchar(64) COLLATE utf8_unicode_ci,
-is_deleted tinyint(4) default '0'
-);
-
-drop table if exists civicrm_currency;
-create table civicrm_currency (
-id int(10) unsigned auto_increment primary key,
-name varchar(64) COLLATE utf8_unicode_ci,
-symbol varchar(8) COLLATE utf8_unicode_ci,
-key UI_name (name)
-);
-insert into civicrm_currency (name, symbol)
-values
-('USD', '$'),
-('CAD', '$'),
-('GBP', '£'),
-('DZD', NULL);
-
-drop table if exists wmf_donor;
-create table wmf_donor (
-id int(10) unsigned,
-entity_id int(10) unsigned,
-do_not_solicit tinyint(4),
-is_2006_donor tinyint(4),
-is_2007_donor tinyint(4),
-is_2008_donor tinyint(4),
-is_2009_donor tinyint(4),
-is_2010_donor tinyint(4),
-is_2011_donor tinyint(4),
-is_2012_donor tinyint(4),
-is_2013_donor tinyint(4),
-is_2014_donor tinyint(4),
-is_2015_donor tinyint(4),
-is_2016_donor tinyint(4),
-is_2017_donor tinyint(4),
-is_2018_donor tinyint(4),
-is_2019_donor tinyint(4),
-is_2020_donor tinyint(4),
-is_2021_donor tinyint(4),
-is_2022_donor tinyint(4),
-is_2023_donor tinyint(4),
-is_2024_donor tinyint(4),
-is_2025_donor tinyint(4),
-last_donation_date datetime,
-last_donation_currency varchar(255) COLLATE utf8_unicode_ci,
-last_donation_amount decimal(20,2),
-last_donation_usd decimal(20,2),
-lifetime_usd_total decimal(20,2)
-);
-
-drop table if exists civicrm_contribution;
-create table civicrm_contribution (
-id int(10) unsigned,
-contact_id int(10) unsigned,
-receive_date datetime,
-total_amount decimal(20,2),
-trxn_id varchar(255) COLLATE utf8_unicode_ci,
-contribution_status_id int(10) unsigned
-);
-
-drop table if exists civicrm_address;
-create table civicrm_address (
-id int(10) unsigned auto_increment primary key,
-contact_id int(10) unsigned,
-is_primary tinyint(4),
-city varchar(64) COLLATE utf8_unicode_ci,
-postal_code varchar(64) COLLATE utf8_unicode_ci,
-country_id int(10) unsigned,
-state_province_id int(10) unsigned,
-timezone varchar(8) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_country;
-create table civicrm_country (
-id int(10) unsigned,
-iso_code char(2) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_state_province;
-create table civicrm_state_province (
-  id int(10) unsigned,
-  name varchar(64) COLLATE utf8_unicode_ci
-);
-
-drop table if exists wmf_contribution_extra;
-create table wmf_contribution_extra (
-entity_id int(10) unsigned,
-original_amount decimal(20,2),
-original_currency varchar(255) COLLATE utf8_unicode_ci
-);
-
-drop table if exists contribution_tracking;
-create table contribution_tracking (
-contribution_id int(10) unsigned,
-country varchar(2)
-);
-
-drop table if exists log_civicrm_email;
-create table log_civicrm_email (
-email varchar(254) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_uf_match;
-create table civicrm_uf_match (
-uf_name varchar(128) COLLATE utf8_unicode_ci
-);
->>> BRANCH (bce403 Add lastet_currency_symbol to export)

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-09-28 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381293 )

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

5708cf1 Add 'first_donation_date' column to Silverpop export
ce509d7 Alter definition of silverpop_countrylangs to match actual

Change-Id: Id6194f31078c6fb3616bc26c457853426286f653
---
D silverpop_export/tests/test_update.py
1 file changed, 0 insertions(+), 263 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/93/381293/1

diff --git a/silverpop_export/tests/test_update.py 
b/silverpop_export/tests/test_update.py
deleted file mode 100644
index 8b4fbe1..000
--- a/silverpop_export/tests/test_update.py
+++ /dev/null
@@ -1,263 +0,0 @@
-<<< HEAD   (8d3980 Merge branch 'master' into deploy)
-===
-import datetime
-from decimal import Decimal
-import mock
-import MySQLdb
-import os
-import warnings
-
-import database.db
-import silverpop_export.update
-
-conn = None
-db_name = None
-
-
-def setup():
-global conn
-global db_name
-# FIXME: parameterize test configuration better
-db_host = "127.0.0.1"
-db_pass = None
-if 'EXECUTOR_NUMBER' in os.environ:
-# We're running under Jenkins.  Assume things.
-db_name = "test"
-db_user = "root"
-else:
-db_name = "test"
-db_user = "test"
-
-db_params = {"user": db_user, "host": db_host}
-if db_pass:
-db_params['passwd'] = db_pass
-
-conn = database.db.Connection(**db_params)
-conn.execute("set default_storage_engine=memory")
-conn.execute("drop database if exists " + db_name)
-conn.execute("create database " + db_name)
-conn.db_conn.select_db(db_name)
-
-
-def test_test_setup():
-'''
-Set up the civcrm and export databases and run the update with no data.
-'''
-run_update_with_fixtures(fixture_queries=[])
-
-
-def test_duplicate():
-'''
-Test that we export one record for a duplicate contact.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0),
-(2, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1),
-(2);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select count(*) from silverpop_export")
-assert cursor.fetchone() == (1,)
-
-
-def test_no_donations():
-'''
-Test that we set the donation-related fields correctly when a contact has
-no donations.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select has_recurred_donation, highest_usd_amount, " +
-   "highest_native_amount, highest_native_currency, " +
-   "highest_donation_date, lifetime_usd_total, " +
-   "donation_count, latest_currency, latest_native_amount, " +
-   "latest_usd_amount, latest_donation_date from 
silverpop_export_view")
-actual = cursor.fetchone()
-expected = ('NO', Decimal('0.00'),
-Decimal('0.00'), '',
-'', Decimal('0.00'),
-0, '', Decimal('0.00'),
-Decimal('0.00'), '')
-assert actual == expected
-
-
-def test_refund_history():
-'''
-Test that we don't include refunded donations in a donor's history
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-""", """
-insert into civicrm_contribution (id, contact_id, receive_date, 
total_amount, trxn_id, contribution_status_id) values
-(1, 1, '2015-01-03', 15.25, 'xyz123', 1),
-(2, 1, '2016-05-05', 25.25, 'abc456', 9);
-""", """
-insert into wmf_contribution_extra (entity_id, original_amount, 
original_currency) values
-(1, 20.15, 'CAD'),
-(2, 35.15, 'CAD');
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select highest_usd_amount, lifetime_usd_total, 
donation_count, latest_currency, latest_native_amount, latest_usd_amount, 
latest_donation  from silverpop_export")
-expected = (Decimal('15.25'), Decimal('15.25'), 1, 'CAD', 
Decimal('20.15'), Decimal('15.25'), datetime.datetime(2015, 1, 3))
-assert cursor.fetchone() == expected
-
-
-def test_first_donation():
-"""
-Test that we correctly calculate the first donation date,
-not counting refunded donations.
-"""
-
-

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-09-28 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/381293 )

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

5708cf1 Add 'first_donation_date' column to Silverpop export
ce509d7 Alter definition of silverpop_countrylangs to match actual

Change-Id: Id6194f31078c6fb3616bc26c457853426286f653
---
D silverpop_export/tests/test_update.py
1 file changed, 0 insertions(+), 263 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/silverpop_export/tests/test_update.py 
b/silverpop_export/tests/test_update.py
deleted file mode 100644
index 8b4fbe1..000
--- a/silverpop_export/tests/test_update.py
+++ /dev/null
@@ -1,263 +0,0 @@
-<<< HEAD   (8d3980 Merge branch 'master' into deploy)
-===
-import datetime
-from decimal import Decimal
-import mock
-import MySQLdb
-import os
-import warnings
-
-import database.db
-import silverpop_export.update
-
-conn = None
-db_name = None
-
-
-def setup():
-global conn
-global db_name
-# FIXME: parameterize test configuration better
-db_host = "127.0.0.1"
-db_pass = None
-if 'EXECUTOR_NUMBER' in os.environ:
-# We're running under Jenkins.  Assume things.
-db_name = "test"
-db_user = "root"
-else:
-db_name = "test"
-db_user = "test"
-
-db_params = {"user": db_user, "host": db_host}
-if db_pass:
-db_params['passwd'] = db_pass
-
-conn = database.db.Connection(**db_params)
-conn.execute("set default_storage_engine=memory")
-conn.execute("drop database if exists " + db_name)
-conn.execute("create database " + db_name)
-conn.db_conn.select_db(db_name)
-
-
-def test_test_setup():
-'''
-Set up the civcrm and export databases and run the update with no data.
-'''
-run_update_with_fixtures(fixture_queries=[])
-
-
-def test_duplicate():
-'''
-Test that we export one record for a duplicate contact.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0),
-(2, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1),
-(2);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select count(*) from silverpop_export")
-assert cursor.fetchone() == (1,)
-
-
-def test_no_donations():
-'''
-Test that we set the donation-related fields correctly when a contact has
-no donations.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select has_recurred_donation, highest_usd_amount, " +
-   "highest_native_amount, highest_native_currency, " +
-   "highest_donation_date, lifetime_usd_total, " +
-   "donation_count, latest_currency, latest_native_amount, " +
-   "latest_usd_amount, latest_donation_date from 
silverpop_export_view")
-actual = cursor.fetchone()
-expected = ('NO', Decimal('0.00'),
-Decimal('0.00'), '',
-'', Decimal('0.00'),
-0, '', Decimal('0.00'),
-Decimal('0.00'), '')
-assert actual == expected
-
-
-def test_refund_history():
-'''
-Test that we don't include refunded donations in a donor's history
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-""", """
-insert into civicrm_contribution (id, contact_id, receive_date, 
total_amount, trxn_id, contribution_status_id) values
-(1, 1, '2015-01-03', 15.25, 'xyz123', 1),
-(2, 1, '2016-05-05', 25.25, 'abc456', 9);
-""", """
-insert into wmf_contribution_extra (entity_id, original_amount, 
original_currency) values
-(1, 20.15, 'CAD'),
-(2, 35.15, 'CAD');
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select highest_usd_amount, lifetime_usd_total, 
donation_count, latest_currency, latest_native_amount, latest_usd_amount, 
latest_donation  from silverpop_export")
-expected = (Decimal('15.25'), Decimal('15.25'), 1, 'CAD', 
Decimal('20.15'), Decimal('15.25'), datetime.datetime(2015, 1, 3))
-assert cursor.fetchone() == expected
-
-
-def test_first_donation():
-"""
-Test that we correctly calculate the first donation date,
-not counting refunded donations.
-"""
-
-

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-09-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/376064 )

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

cabf66b Add filename to paypal audit failmail
3d6f6a3 PayPal audit: check for existing recurring donations

Change-Id: I502f74358f74c46a690690113075ee8df71f79b7
---
D audit/paypal/tests/test_trr_file.py
1 file changed, 0 insertions(+), 305 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/audit/paypal/tests/test_trr_file.py 
b/audit/paypal/tests/test_trr_file.py
deleted file mode 100644
index c3aac7a..000
--- a/audit/paypal/tests/test_trr_file.py
+++ /dev/null
@@ -1,305 +0,0 @@
-<<< HEAD   (955422 Merge branch 'master' into deploy)
-===
-import csv
-from mock import patch
-import nose.tools
-import os
-
-import audit.paypal.TrrFile
-
-# weird thing we have to do to get better assert_equals feedback
-nose.tools.assert_equals.im_class.maxDiff = None
-
-
-def get_base_row():
-
-return {
-"Column Type": "SB",
-"Transaction ID": "AS7D98AS7D9A8S7D9AS",
-"Invoice ID": "",
-"PayPal Reference ID": "",
-"PayPal Reference ID Type": "",
-"Transaction Event Code": "",
-"Transaction Initiation Date": "2016/09/24 11:55:01 -0700",
-"Transaction Completion Date": "2016/09/24 11:55:01 -0700",
-"Transaction Debit or Credit": "",
-"Gross Transaction Amount": "1000",
-"Gross Transaction Currency": "USD",
-"Fee Debit or Credit": "",
-"Fee Amount": "55",
-"Fee Currency": "USD",
-"Transactional Status": "S",
-"Insurance Amount": "",
-"Sales Tax Amount": "0",
-"Shipping Amount": "0",
-"Transaction Subject": "",
-"Transaction Note": "",
-"Payer's Account ID": "pranks...@anonymous.net",
-"Payer Address Status": "N",
-"Item Name": "Generous benificence",
-"Item ID": "DONATE",
-"Option 1 Name": "",
-"Option 1 Value": "",
-"Option 2 Name": "",
-"Option 2 Value": "",
-"Auction Site": "",
-"Auction Buyer ID": "",
-"Auction Closing Date": "",
-"Shipping Address Line1": "",
-"Shipping Address Line2": "",
-"Shipping Address City": "",
-"Shipping Address State": "",
-"Shipping Address Zip": "",
-"Shipping Address Country": "",
-"Shipping Method": "",
-"Custom Field": "1234567",
-"Billing Address Line1": "",
-"Billing Address Line2": "",
-"Billing Address City": "",
-"Billing Address State": "",
-"Billing Address Zip": "",
-"Billing Address Country": "",
-"Consumer ID": "",
-"First Name": "Banana",
-"Last Name": "Man",
-"Consumer Business Name": "",
-"Card Type": "",
-"Payment Source": "",
-"Shipping Name": "",
-"Authorization Review Status": "",
-"Protection Eligibility": "",
-"Payment Tracking ID": ""
-}
-
-
-def get_refund_row():
-
-row = get_base_row()
-row.update({
-"PayPal Reference ID": "3GJH3GJ3334214812",
-"PayPal Reference ID Type": "TXN",
-"Transaction Event Code": "T1107",
-"Transaction Debit or Credit": "DR",
-"Fee Debit or Credit": "CR",
-"Fee Amount": "55",
-"Transaction Note": "refund",
-})
-return row
-
-
-def get_recurring_row():
-row = get_base_row()
-row.update({
-"PayPal Reference ID": "3GJH3GJ3334214812",
-"PayPal Reference ID Type": "SUB",
-"Transaction Event Code": "T0002",
-"Gross Transaction Amount": "10.00",
-})
-return row
-
-
-def get_csv_row(filename):
-path = os.path.dirname(__file__) + "/data/" + filename + ".csv"
-with open(path, 'r') as datafile:
-r = csv.DictReader(datafile)
-return r.next()
-
-
-@patch("queue.redis_wrap.Redis")
-@patch("civicrm.civicrm.Civicrm")
-@patch("process.globals")
-@patch("audit.paypal.paypal_api.PaypalApiClassic")
-def test_recurring_charge_without_subscription(MockPaypalApi, MockGlobals, 
MockCivicrm, MockRedis):
-'''
-Regression test for T143903
-'''
-row = get_recurring_row()
-row["Transaction ID"] = ""
-row["PayPal Reference ID"] = ""
-
-MockCivicrm().transaction_exists.return_value = False
-
-parser = audit.paypal.TrrFile.TrrFile("dummy_path")
-with nose.tools.assert_raises(Exception) as cm:
-parser.parse_line(row)
-
-# Should have failed with a specific missing field error.
-# FIXME: Annoyingly, this masks any other, unexpected exception.
-assert cm.exception.message == "Missing field subscr_id"
-
-# Make sure we didn't try to send anything to the queue.
-MockRedis().send.assert_has_calls([])
-
-

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-09-05 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376064 )

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

cabf66b Add filename to paypal audit failmail
3d6f6a3 PayPal audit: check for existing recurring donations

Change-Id: I502f74358f74c46a690690113075ee8df71f79b7
---
D audit/paypal/tests/test_trr_file.py
1 file changed, 0 insertions(+), 305 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/64/376064/1

diff --git a/audit/paypal/tests/test_trr_file.py 
b/audit/paypal/tests/test_trr_file.py
deleted file mode 100644
index c3aac7a..000
--- a/audit/paypal/tests/test_trr_file.py
+++ /dev/null
@@ -1,305 +0,0 @@
-<<< HEAD   (955422 Merge branch 'master' into deploy)
-===
-import csv
-from mock import patch
-import nose.tools
-import os
-
-import audit.paypal.TrrFile
-
-# weird thing we have to do to get better assert_equals feedback
-nose.tools.assert_equals.im_class.maxDiff = None
-
-
-def get_base_row():
-
-return {
-"Column Type": "SB",
-"Transaction ID": "AS7D98AS7D9A8S7D9AS",
-"Invoice ID": "",
-"PayPal Reference ID": "",
-"PayPal Reference ID Type": "",
-"Transaction Event Code": "",
-"Transaction Initiation Date": "2016/09/24 11:55:01 -0700",
-"Transaction Completion Date": "2016/09/24 11:55:01 -0700",
-"Transaction Debit or Credit": "",
-"Gross Transaction Amount": "1000",
-"Gross Transaction Currency": "USD",
-"Fee Debit or Credit": "",
-"Fee Amount": "55",
-"Fee Currency": "USD",
-"Transactional Status": "S",
-"Insurance Amount": "",
-"Sales Tax Amount": "0",
-"Shipping Amount": "0",
-"Transaction Subject": "",
-"Transaction Note": "",
-"Payer's Account ID": "pranks...@anonymous.net",
-"Payer Address Status": "N",
-"Item Name": "Generous benificence",
-"Item ID": "DONATE",
-"Option 1 Name": "",
-"Option 1 Value": "",
-"Option 2 Name": "",
-"Option 2 Value": "",
-"Auction Site": "",
-"Auction Buyer ID": "",
-"Auction Closing Date": "",
-"Shipping Address Line1": "",
-"Shipping Address Line2": "",
-"Shipping Address City": "",
-"Shipping Address State": "",
-"Shipping Address Zip": "",
-"Shipping Address Country": "",
-"Shipping Method": "",
-"Custom Field": "1234567",
-"Billing Address Line1": "",
-"Billing Address Line2": "",
-"Billing Address City": "",
-"Billing Address State": "",
-"Billing Address Zip": "",
-"Billing Address Country": "",
-"Consumer ID": "",
-"First Name": "Banana",
-"Last Name": "Man",
-"Consumer Business Name": "",
-"Card Type": "",
-"Payment Source": "",
-"Shipping Name": "",
-"Authorization Review Status": "",
-"Protection Eligibility": "",
-"Payment Tracking ID": ""
-}
-
-
-def get_refund_row():
-
-row = get_base_row()
-row.update({
-"PayPal Reference ID": "3GJH3GJ3334214812",
-"PayPal Reference ID Type": "TXN",
-"Transaction Event Code": "T1107",
-"Transaction Debit or Credit": "DR",
-"Fee Debit or Credit": "CR",
-"Fee Amount": "55",
-"Transaction Note": "refund",
-})
-return row
-
-
-def get_recurring_row():
-row = get_base_row()
-row.update({
-"PayPal Reference ID": "3GJH3GJ3334214812",
-"PayPal Reference ID Type": "SUB",
-"Transaction Event Code": "T0002",
-"Gross Transaction Amount": "10.00",
-})
-return row
-
-
-def get_csv_row(filename):
-path = os.path.dirname(__file__) + "/data/" + filename + ".csv"
-with open(path, 'r') as datafile:
-r = csv.DictReader(datafile)
-return r.next()
-
-
-@patch("queue.redis_wrap.Redis")
-@patch("civicrm.civicrm.Civicrm")
-@patch("process.globals")
-@patch("audit.paypal.paypal_api.PaypalApiClassic")
-def test_recurring_charge_without_subscription(MockPaypalApi, MockGlobals, 
MockCivicrm, MockRedis):
-'''
-Regression test for T143903
-'''
-row = get_recurring_row()
-row["Transaction ID"] = ""
-row["PayPal Reference ID"] = ""
-
-MockCivicrm().transaction_exists.return_value = False
-
-parser = audit.paypal.TrrFile.TrrFile("dummy_path")
-with nose.tools.assert_raises(Exception) as cm:
-parser.parse_line(row)
-
-# Should have failed with a specific missing field error.
-# FIXME: Annoyingly, this masks any other, unexpected exception.
-assert cm.exception.message == "Missing field subscr_id"
-
-# Make sure we didn't try to send anything to the queue.
-MockRedis().send.assert_has_calls([])
-
-

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-08-01 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/369566 )

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

f997b74 Final export should have blanks instead of NULL

Change-Id: If6967d8f29f9165692491664258cf7b39b805415
---
D silverpop_export/tests/test_update.py
1 file changed, 0 insertions(+), 233 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/silverpop_export/tests/test_update.py 
b/silverpop_export/tests/test_update.py
deleted file mode 100644
index ddb39fc..000
--- a/silverpop_export/tests/test_update.py
+++ /dev/null
@@ -1,233 +0,0 @@
-<<< HEAD   (58bcbf Merge branch 'master' into deploy)
-===
-import datetime
-from decimal import Decimal
-import mock
-import MySQLdb
-import os
-import warnings
-
-import database.db
-import silverpop_export.update
-
-conn = None
-db_name = None
-
-
-def setup():
-global conn
-global db_name
-# FIXME: parameterize test configuration better
-db_host = "127.0.0.1"
-db_pass = None
-if 'EXECUTOR_NUMBER' in os.environ:
-# We're running under Jenkins.  Assume things.
-db_name = "test"
-db_user = "root"
-else:
-db_name = "test"
-db_user = "test"
-
-db_params = {"user": db_user, "host": db_host}
-if db_pass:
-db_params['passwd'] = db_pass
-
-conn = database.db.Connection(**db_params)
-conn.execute("set default_storage_engine=memory")
-conn.execute("drop database if exists " + db_name)
-conn.execute("create database " + db_name)
-conn.db_conn.select_db(db_name)
-
-
-def test_test_setup():
-'''
-Set up the civcrm and export databases and run the update with no data.
-'''
-run_update_with_fixtures(fixture_queries=[])
-
-
-def test_duplicate():
-'''
-Test that we export one record for a duplicate contact.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0),
-(2, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1),
-(2);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select count(*) from silverpop_export")
-assert cursor.fetchone() == (1,)
-
-
-def test_no_donations():
-'''
-Test that we set the donation-related fields correctly when a contact has
-no donations.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select has_recurred_donation, highest_usd_amount, " +
-   "highest_native_amount, highest_native_currency, " +
-   "highest_donation_date, lifetime_usd_total, " +
-   "donation_count, latest_currency, latest_native_amount, " +
-   "latest_usd_amount, latest_donation_date from 
silverpop_export_view")
-actual = cursor.fetchone()
-expected = ('NO', Decimal('0.00'),
-Decimal('0.00'), '',
-'', Decimal('0.00'),
-0, '', Decimal('0.00'),
-Decimal('0.00'), '')
-assert actual == expected
-
-
-def test_refund_history():
-'''
-Test that we don't include refunded donations in a donor's history
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-""", """
-insert into civicrm_contribution (id, contact_id, receive_date, 
total_amount, trxn_id, contribution_status_id) values
-(1, 1, '2015-01-03', 15.25, 'xyz123', 1),
-(2, 1, '2016-05-05', 25.25, 'abc456', 9);
-""", """
-insert into wmf_contribution_extra (entity_id, original_amount, 
original_currency) values
-(1, 20.15, 'CAD'),
-(2, 35.15, 'CAD');
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select highest_usd_amount, lifetime_usd_total, 
donation_count, latest_currency, latest_native_amount, latest_usd_amount, 
latest_donation  from silverpop_export")
-expected = (Decimal('15.25'), Decimal('15.25'), 1, 'CAD', 
Decimal('20.15'), Decimal('15.25'), datetime.datetime(2015, 1, 3))
-assert cursor.fetchone() == expected
-
-
-def test_timezone():
-'''
-Test that we export timezone records where they exist
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost',

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-08-01 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369566 )

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

f997b74 Final export should have blanks instead of NULL

Change-Id: If6967d8f29f9165692491664258cf7b39b805415
---
D silverpop_export/tests/test_update.py
1 file changed, 0 insertions(+), 233 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/66/369566/1

diff --git a/silverpop_export/tests/test_update.py 
b/silverpop_export/tests/test_update.py
deleted file mode 100644
index ddb39fc..000
--- a/silverpop_export/tests/test_update.py
+++ /dev/null
@@ -1,233 +0,0 @@
-<<< HEAD   (58bcbf Merge branch 'master' into deploy)
-===
-import datetime
-from decimal import Decimal
-import mock
-import MySQLdb
-import os
-import warnings
-
-import database.db
-import silverpop_export.update
-
-conn = None
-db_name = None
-
-
-def setup():
-global conn
-global db_name
-# FIXME: parameterize test configuration better
-db_host = "127.0.0.1"
-db_pass = None
-if 'EXECUTOR_NUMBER' in os.environ:
-# We're running under Jenkins.  Assume things.
-db_name = "test"
-db_user = "root"
-else:
-db_name = "test"
-db_user = "test"
-
-db_params = {"user": db_user, "host": db_host}
-if db_pass:
-db_params['passwd'] = db_pass
-
-conn = database.db.Connection(**db_params)
-conn.execute("set default_storage_engine=memory")
-conn.execute("drop database if exists " + db_name)
-conn.execute("create database " + db_name)
-conn.db_conn.select_db(db_name)
-
-
-def test_test_setup():
-'''
-Set up the civcrm and export databases and run the update with no data.
-'''
-run_update_with_fixtures(fixture_queries=[])
-
-
-def test_duplicate():
-'''
-Test that we export one record for a duplicate contact.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0),
-(2, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1),
-(2);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select count(*) from silverpop_export")
-assert cursor.fetchone() == (1,)
-
-
-def test_no_donations():
-'''
-Test that we set the donation-related fields correctly when a contact has
-no donations.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select has_recurred_donation, highest_usd_amount, " +
-   "highest_native_amount, highest_native_currency, " +
-   "highest_donation_date, lifetime_usd_total, " +
-   "donation_count, latest_currency, latest_native_amount, " +
-   "latest_usd_amount, latest_donation_date from 
silverpop_export_view")
-actual = cursor.fetchone()
-expected = ('NO', Decimal('0.00'),
-Decimal('0.00'), '',
-'', Decimal('0.00'),
-0, '', Decimal('0.00'),
-Decimal('0.00'), '')
-assert actual == expected
-
-
-def test_refund_history():
-'''
-Test that we don't include refunded donations in a donor's history
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-""", """
-insert into civicrm_contribution (id, contact_id, receive_date, 
total_amount, trxn_id, contribution_status_id) values
-(1, 1, '2015-01-03', 15.25, 'xyz123', 1),
-(2, 1, '2016-05-05', 25.25, 'abc456', 9);
-""", """
-insert into wmf_contribution_extra (entity_id, original_amount, 
original_currency) values
-(1, 20.15, 'CAD'),
-(2, 35.15, 'CAD');
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select highest_usd_amount, lifetime_usd_total, 
donation_count, latest_currency, latest_native_amount, latest_usd_amount, 
latest_donation  from silverpop_export")
-expected = (Decimal('15.25'), Decimal('15.25'), 1, 'CAD', 
Decimal('20.15'), Decimal('15.25'), datetime.datetime(2015, 1, 3))
-assert cursor.fetchone() == expected
-
-
-def test_timezone():
-'''
-Test that we export timezone records where they exist
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1,

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-07-31 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/368813 )

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

5ea9dcf Fix exported values for contacts with no donations

Change-Id: I75992d2a2f51d7801abb963abac4175bf2273542
---
D silverpop_export/tests/test_update.py
1 file changed, 0 insertions(+), 234 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/silverpop_export/tests/test_update.py 
b/silverpop_export/tests/test_update.py
deleted file mode 100644
index e99276f..000
--- a/silverpop_export/tests/test_update.py
+++ /dev/null
@@ -1,234 +0,0 @@
-<<< HEAD   (457bdd Merge branch 'master' into deploy)
-===
-import datetime
-from decimal import Decimal
-import mock
-import MySQLdb
-import os
-import warnings
-
-import database.db
-import silverpop_export.update
-
-conn = None
-db_name = None
-
-
-def setup():
-global conn
-global db_name
-# FIXME: parameterize test configuration better
-db_host = "127.0.0.1"
-db_pass = None
-if 'EXECUTOR_NUMBER' in os.environ:
-# We're running under Jenkins.  Assume things.
-db_name = "test"
-db_user = "root"
-else:
-db_name = "test"
-db_user = "test"
-
-db_params = {"user": db_user, "host": db_host}
-if db_pass:
-db_params['passwd'] = db_pass
-
-conn = database.db.Connection(**db_params)
-conn.execute("set default_storage_engine=memory")
-conn.execute("drop database if exists " + db_name)
-conn.execute("create database " + db_name)
-conn.db_conn.select_db(db_name)
-
-
-def test_test_setup():
-'''
-Set up the civcrm and export databases and run the update with no data.
-'''
-run_update_with_fixtures(fixture_queries=[])
-
-
-def test_duplicate():
-'''
-Test that we export one record for a duplicate contact.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0),
-(2, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1),
-(2);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select count(*) from silverpop_export")
-assert cursor.fetchone() == (1,)
-
-
-def test_no_donations():
-'''
-Test that we set the donation-related fields correctly when a contact has
-no donations.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select has_recurred_donation, highest_usd_amount, " +
-   "highest_native_amount, highest_native_currency, " +
-   "highest_donation_date, lifetime_usd_total, " +
-   "donation_count, latest_currency, latest_native_amount, " +
-   "latest_usd_amount, latest_donation from silverpop_export")
-actual = cursor.fetchone()
-print(actual)
-expected = (0, Decimal('0.00'),
-Decimal('0.00'), None,
-None, Decimal('0.00'),
-0, None, Decimal('0.00'),
-Decimal('0.00'), None)
-assert actual == expected
-
-
-def test_refund_history():
-'''
-Test that we don't include refunded donations in a donor's history
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-""", """
-insert into civicrm_contribution (id, contact_id, receive_date, 
total_amount, trxn_id, contribution_status_id) values
-(1, 1, '2015-01-03', 15.25, 'xyz123', 1),
-(2, 1, '2016-05-05', 25.25, 'abc456', 9);
-""", """
-insert into wmf_contribution_extra (entity_id, original_amount, 
original_currency) values
-(1, 20.15, 'CAD'),
-(2, 35.15, 'CAD');
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select highest_usd_amount, lifetime_usd_total, 
donation_count, latest_currency, latest_native_amount, latest_usd_amount, 
latest_donation  from silverpop_export")
-expected = (Decimal('15.25'), Decimal('15.25'), 1, 'CAD', 
Decimal('20.15'), Decimal('15.25'), datetime.datetime(2015, 1, 3))
-assert cursor.fetchone() == expected
-
-
-def test_timezone():
-'''
-Test that we export timezone records where they exist
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1,

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-07-31 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/368813 )

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

5ea9dcf Fix exported values for contacts with no donations

Change-Id: I75992d2a2f51d7801abb963abac4175bf2273542
---
D silverpop_export/tests/test_update.py
1 file changed, 0 insertions(+), 234 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/13/368813/1

diff --git a/silverpop_export/tests/test_update.py 
b/silverpop_export/tests/test_update.py
deleted file mode 100644
index e99276f..000
--- a/silverpop_export/tests/test_update.py
+++ /dev/null
@@ -1,234 +0,0 @@
-<<< HEAD   (457bdd Merge branch 'master' into deploy)
-===
-import datetime
-from decimal import Decimal
-import mock
-import MySQLdb
-import os
-import warnings
-
-import database.db
-import silverpop_export.update
-
-conn = None
-db_name = None
-
-
-def setup():
-global conn
-global db_name
-# FIXME: parameterize test configuration better
-db_host = "127.0.0.1"
-db_pass = None
-if 'EXECUTOR_NUMBER' in os.environ:
-# We're running under Jenkins.  Assume things.
-db_name = "test"
-db_user = "root"
-else:
-db_name = "test"
-db_user = "test"
-
-db_params = {"user": db_user, "host": db_host}
-if db_pass:
-db_params['passwd'] = db_pass
-
-conn = database.db.Connection(**db_params)
-conn.execute("set default_storage_engine=memory")
-conn.execute("drop database if exists " + db_name)
-conn.execute("create database " + db_name)
-conn.db_conn.select_db(db_name)
-
-
-def test_test_setup():
-'''
-Set up the civcrm and export databases and run the update with no data.
-'''
-run_update_with_fixtures(fixture_queries=[])
-
-
-def test_duplicate():
-'''
-Test that we export one record for a duplicate contact.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0),
-(2, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1),
-(2);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select count(*) from silverpop_export")
-assert cursor.fetchone() == (1,)
-
-
-def test_no_donations():
-'''
-Test that we set the donation-related fields correctly when a contact has
-no donations.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select has_recurred_donation, highest_usd_amount, " +
-   "highest_native_amount, highest_native_currency, " +
-   "highest_donation_date, lifetime_usd_total, " +
-   "donation_count, latest_currency, latest_native_amount, " +
-   "latest_usd_amount, latest_donation from silverpop_export")
-actual = cursor.fetchone()
-print(actual)
-expected = (0, Decimal('0.00'),
-Decimal('0.00'), None,
-None, Decimal('0.00'),
-0, None, Decimal('0.00'),
-Decimal('0.00'), None)
-assert actual == expected
-
-
-def test_refund_history():
-'''
-Test that we don't include refunded donations in a donor's history
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-""", """
-insert into civicrm_contribution (id, contact_id, receive_date, 
total_amount, trxn_id, contribution_status_id) values
-(1, 1, '2015-01-03', 15.25, 'xyz123', 1),
-(2, 1, '2016-05-05', 25.25, 'abc456', 9);
-""", """
-insert into wmf_contribution_extra (entity_id, original_amount, 
original_currency) values
-(1, 20.15, 'CAD'),
-(2, 35.15, 'CAD');
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select highest_usd_amount, lifetime_usd_total, 
donation_count, latest_currency, latest_native_amount, latest_usd_amount, 
latest_donation  from silverpop_export")
-expected = (Decimal('15.25'), Decimal('15.25'), 1, 'CAD', 
Decimal('20.15'), Decimal('15.25'), datetime.datetime(2015, 1, 3))
-assert cursor.fetchone() == expected
-
-
-def test_timezone():
-'''
-Test that we export timezone records where they exist
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-06-19 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359962 )

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

961801a PayPal fixed the double space in their audit header

Change-Id: I02045f7d10f418cef77d8b1f9b2cd4a71a3fc94f
---
D audit/paypal/tests/data/express_checkout_donation.csv
D audit/paypal/tests/data/express_checkout_recurring_donation.csv
D audit/paypal/tests/data/express_checkout_recurring_refund.csv
D audit/paypal/tests/data/express_checkout_refund.csv
D audit/paypal/tests/test_trr_file.py
5 files changed, 0 insertions(+), 307 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/audit/paypal/tests/data/express_checkout_donation.csv 
b/audit/paypal/tests/data/express_checkout_donation.csv
deleted file mode 100644
index f2c4d25..000
--- a/audit/paypal/tests/data/express_checkout_donation.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-<<< HEAD   (585f54 Merge branch 'master' into deploy)
-===
-"CH","Transaction ID","Invoice ID","PayPal Reference ID","PayPal Reference ID 
Type","Transaction Event Code","Transaction Initiation Date","Transaction 
Completion Date","Transaction Debit or Credit","Gross Transaction 
Amount","Gross Transaction Currency","Fee Debit or Credit","Fee Amount","Fee 
Currency","Transactional Status","Insurance Amount","Sales Tax 
Amount","Shipping Amount","Transaction Subject","Transaction Note","Payer's 
Account ID","Payer Address Status","Item Name","Item ID","Option 1 
Name","Option 1 Value","Option 2 Name","Option 2 Value","Auction Site","Auction 
Buyer ID","Auction Closing Date","Shipping Address Line1","Shipping Address 
Line2","Shipping Address City","Shipping Address State","Shipping Address 
Zip","Shipping Address Country","Shipping Method","Custom Field","Billing 
Address Line1","Billing Address Line2","Billing Address City","Billing Address 
State","Billing Address Zip","Billing Address Country","Consumer ID","First 
Name","Last Name","Consumer Business Name","Card Type","Payment 
Source","Shipping Name","Authorization Review Status","Protection 
Eligibility","Payment Tracking ID"
-"SB","1V551844CE5526421","46239229.0","","","T0006",2017/03/02 09:59:55 
-0800,2017/03/02 09:59:55 
-0800,"CR",15000,"JPY","DR",4300,"JPY","S",,0,0,"Donation to the Wikimedia 
Foundation","","do...@generous.net","N","Donation to the Wikimedia 
Foundation","","","","","","","",,"","","","","","","","46239229","321 Notta 
Boulevard","","Whoville","OR","97211","US","RTWSDJI4S8DWK","Cindy 
Lou","Who","Cindy Lou Who","","Express Checkout","Cindy Lou, Who","01","02",""
->>> BRANCH (961801 PayPal fixed the double space in their audit header)
diff --git a/audit/paypal/tests/data/express_checkout_recurring_donation.csv 
b/audit/paypal/tests/data/express_checkout_recurring_donation.csv
deleted file mode 100644
index 98a3a53..000
--- a/audit/paypal/tests/data/express_checkout_recurring_donation.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-<<< HEAD   (585f54 Merge branch 'master' into deploy)
-===
-"CH","Transaction ID","Invoice ID","PayPal Reference ID","PayPal Reference ID 
Type","Transaction Event Code","Transaction Initiation Date","Transaction 
Completion Date","Transaction Debit or Credit","Gross Transaction 
Amount","Gross Transaction Currency","Fee Debit or Credit","Fee Amount","Fee 
Currency","Transactional Status","Insurance Amount","Sales Tax 
Amount","Shipping Amount","Transaction Subject","Transaction Note","Payer's 
Account ID","Payer Address Status","Item Name","Item ID","Option 1 
Name","Option 1 Value","Option 2 Name","Option 2 Value","Auction Site","Auction 
Buyer ID","Auction Closing Date","Shipping Address Line1","Shipping Address 
Line2","Shipping Address City","Shipping Address State","Shipping Address 
Zip","Shipping Address Country","Shipping Method","Custom Field","Billing 
Address Line1","Billing Address Line2","Billing Address City","Billing Address 
State","Billing Address Zip","Billing Address Country","Consumer ID","First 
Name","Last Name","Consumer Business Name","Card Type","Payment 
Source","Shipping Name","Authorization Review Status","Protection 
Eligibility","Payment Tracking ID"
-"SB","4JH2438EE9876546W","45931681","I-SS5RD7POSD46","","T0002",2017/03/04 
05:36:05 -0800,2017/03/04 05:36:05 
-0800,"CR",15000,"JPY","DR",4300,"JPY","S",,,0,"Monthly donation to the 
Wikimedia Foundation","","do...@generous.net","N","Monthly donation to the 
Wikimedia 
Foundation","","","","","","","",,"","","","","","","","","","","","","","","RTWSDJI4S8DWK","Cindy
 Lou","Who","Cindy Lou Who","","Others","Cindy Lou, Who","01","02",""
-
->>> BRANCH (961801 PayPal fixed the double space in their audit header)
diff --git a/audit/paypal/tests/data/express_checkout_recurring_refund.csv 
b/audit/paypal/tests/data/express_checkout_recurring_refund.csv
deleted file mode 100644
index

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-06-19 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359962 )

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

961801a PayPal fixed the double space in their audit header

Change-Id: I02045f7d10f418cef77d8b1f9b2cd4a71a3fc94f
---
D audit/paypal/tests/data/express_checkout_donation.csv
D audit/paypal/tests/data/express_checkout_recurring_donation.csv
D audit/paypal/tests/data/express_checkout_recurring_refund.csv
D audit/paypal/tests/data/express_checkout_refund.csv
D audit/paypal/tests/test_trr_file.py
5 files changed, 0 insertions(+), 307 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/62/359962/1

diff --git a/audit/paypal/tests/data/express_checkout_donation.csv 
b/audit/paypal/tests/data/express_checkout_donation.csv
deleted file mode 100644
index f2c4d25..000
--- a/audit/paypal/tests/data/express_checkout_donation.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-<<< HEAD   (585f54 Merge branch 'master' into deploy)
-===
-"CH","Transaction ID","Invoice ID","PayPal Reference ID","PayPal Reference ID 
Type","Transaction Event Code","Transaction Initiation Date","Transaction 
Completion Date","Transaction Debit or Credit","Gross Transaction 
Amount","Gross Transaction Currency","Fee Debit or Credit","Fee Amount","Fee 
Currency","Transactional Status","Insurance Amount","Sales Tax 
Amount","Shipping Amount","Transaction Subject","Transaction Note","Payer's 
Account ID","Payer Address Status","Item Name","Item ID","Option 1 
Name","Option 1 Value","Option 2 Name","Option 2 Value","Auction Site","Auction 
Buyer ID","Auction Closing Date","Shipping Address Line1","Shipping Address 
Line2","Shipping Address City","Shipping Address State","Shipping Address 
Zip","Shipping Address Country","Shipping Method","Custom Field","Billing 
Address Line1","Billing Address Line2","Billing Address City","Billing Address 
State","Billing Address Zip","Billing Address Country","Consumer ID","First 
Name","Last Name","Consumer Business Name","Card Type","Payment 
Source","Shipping Name","Authorization Review Status","Protection 
Eligibility","Payment Tracking ID"
-"SB","1V551844CE5526421","46239229.0","","","T0006",2017/03/02 09:59:55 
-0800,2017/03/02 09:59:55 
-0800,"CR",15000,"JPY","DR",4300,"JPY","S",,0,0,"Donation to the Wikimedia 
Foundation","","do...@generous.net","N","Donation to the Wikimedia 
Foundation","","","","","","","",,"","","","","","","","46239229","321 Notta 
Boulevard","","Whoville","OR","97211","US","RTWSDJI4S8DWK","Cindy 
Lou","Who","Cindy Lou Who","","Express Checkout","Cindy Lou, Who","01","02",""
->>> BRANCH (961801 PayPal fixed the double space in their audit header)
diff --git a/audit/paypal/tests/data/express_checkout_recurring_donation.csv 
b/audit/paypal/tests/data/express_checkout_recurring_donation.csv
deleted file mode 100644
index 98a3a53..000
--- a/audit/paypal/tests/data/express_checkout_recurring_donation.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-<<< HEAD   (585f54 Merge branch 'master' into deploy)
-===
-"CH","Transaction ID","Invoice ID","PayPal Reference ID","PayPal Reference ID 
Type","Transaction Event Code","Transaction Initiation Date","Transaction 
Completion Date","Transaction Debit or Credit","Gross Transaction 
Amount","Gross Transaction Currency","Fee Debit or Credit","Fee Amount","Fee 
Currency","Transactional Status","Insurance Amount","Sales Tax 
Amount","Shipping Amount","Transaction Subject","Transaction Note","Payer's 
Account ID","Payer Address Status","Item Name","Item ID","Option 1 
Name","Option 1 Value","Option 2 Name","Option 2 Value","Auction Site","Auction 
Buyer ID","Auction Closing Date","Shipping Address Line1","Shipping Address 
Line2","Shipping Address City","Shipping Address State","Shipping Address 
Zip","Shipping Address Country","Shipping Method","Custom Field","Billing 
Address Line1","Billing Address Line2","Billing Address City","Billing Address 
State","Billing Address Zip","Billing Address Country","Consumer ID","First 
Name","Last Name","Consumer Business Name","Card Type","Payment 
Source","Shipping Name","Authorization Review Status","Protection 
Eligibility","Payment Tracking ID"
-"SB","4JH2438EE9876546W","45931681","I-SS5RD7POSD46","","T0002",2017/03/04 
05:36:05 -0800,2017/03/04 05:36:05 
-0800,"CR",15000,"JPY","DR",4300,"JPY","S",,,0,"Monthly donation to the 
Wikimedia Foundation","","do...@generous.net","N","Monthly donation to the 
Wikimedia 
Foundation","","","","","","","",,"","","","","","","","","","","","","","","RTWSDJI4S8DWK","Cindy
 Lou","Who","Cindy Lou Who","","Others","Cindy Lou, Who","01","02",""
-
->>> BRANCH (961801 PayPal fixed the double space in their audit header)
diff --git a/audit/paypal/tests/data/express_checkout_recurring_refund.csv 
b/audit/paypal/tests/data/express_checkout_recurring_refund.csv
deleted file mode 100644

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-06-13 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/358886 )

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

7d065bf Only send selected payment identifiers in failmail

Change-Id: I8b0846aa4889dc59705dfbcdbd85337ee215c7cf
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/86/358886/1


-- 
To view, visit https://gerrit.wikimedia.org/r/358886
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b0846aa4889dc59705dfbcdbd85337ee215c7cf
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-06-13 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358886 )

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

7d065bf Only send selected payment identifiers in failmail

Change-Id: I8b0846aa4889dc59705dfbcdbd85337ee215c7cf
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/358886
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8b0846aa4889dc59705dfbcdbd85337ee215c7cf
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-05-03 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/351731 )

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

2c79ad1 Remove debugging code

Change-Id: I55c18e2ab7a59e30e88fce72966a931480a88de8
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/351731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I55c18e2ab7a59e30e88fce72966a931480a88de8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-05-02 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/351441 )

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

4b77668 Normalize subscr_ messages from SAR files

Change-Id: I60624ea463bb84c2310b60f15333c038f3bc0329
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/351441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I60624ea463bb84c2310b60f15333c038f3bc0329
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-05-02 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/351441 )

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

4b77668 Normalize subscr_ messages from SAR files

Change-Id: I60624ea463bb84c2310b60f15333c038f3bc0329
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/41/351441/1


-- 
To view, visit https://gerrit.wikimedia.org/r/351441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I60624ea463bb84c2310b60f15333c038f3bc0329
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-04-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/347789 )

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

ddc70dd Don't crash on missing ct_id

Change-Id: I22295a341cd996300ed75c1cd9707d27c4825b2d
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/347789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I22295a341cd996300ed75c1cd9707d27c4825b2d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-04-11 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/347789 )

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

ddc70dd Don't crash on missing ct_id

Change-Id: I22295a341cd996300ed75c1cd9707d27c4825b2d
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/89/347789/1


-- 
To view, visit https://gerrit.wikimedia.org/r/347789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I22295a341cd996300ed75c1cd9707d27c4825b2d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-02-02 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/335688 )

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

fe3cf55 Change gateway for Express Checkout

Change-Id: Ia92bcdc667d50ba6d9f46a271f264a5836b34780
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/88/335688/1


-- 
To view, visit https://gerrit.wikimedia.org/r/335688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia92bcdc667d50ba6d9f46a271f264a5836b34780
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2017-02-02 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/335688 )

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

fe3cf55 Change gateway for Express Checkout

Change-Id: Ia92bcdc667d50ba6d9f46a271f264a5836b34780
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/335688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia92bcdc667d50ba6d9f46a271f264a5836b34780
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-11-21 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

0880bf8 Fix query snippet logging
1c1df94 Fix width of timezone column

Change-Id: Iefcb5df83c87993d82f6618593434000106ba8c8
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/322805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iefcb5df83c87993d82f6618593434000106ba8c8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-11-21 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/322805

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

0880bf8 Fix query snippet logging
1c1df94 Fix width of timezone column

Change-Id: Iefcb5df83c87993d82f6618593434000106ba8c8
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/05/322805/1


-- 
To view, visit https://gerrit.wikimedia.org/r/322805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefcb5df83c87993d82f6618593434000106ba8c8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-11-17 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

b1006f5 Fix spacing
06124bb Paypal audit: fix checking for refunds in CiviCRM

Change-Id: I6c1a60989a221e808b9fb740853bb1feb9921c08
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/322216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c1a60989a221e808b9fb740853bb1feb9921c08
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-11-17 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/322216

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

b1006f5 Fix spacing
06124bb Paypal audit: fix checking for refunds in CiviCRM

Change-Id: I6c1a60989a221e808b9fb740853bb1feb9921c08
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/16/322216/1


-- 
To view, visit https://gerrit.wikimedia.org/r/322216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c1a60989a221e808b9fb740853bb1feb9921c08
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-11-16 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321904

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

cc55e02 Add highest_native_amount to Silverpop export
3115792 Consolidate updates from intermediate tables
314e3e7 SP export: log a snippet of the query, not just #

Change-Id: I3c7e649b8231a4789d6b3d9c5bd2e957b05c8b4a
---
D silverpop_export/tests/test_update.py
1 file changed, 0 insertions(+), 204 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/04/321904/1

diff --git a/silverpop_export/tests/test_update.py 
b/silverpop_export/tests/test_update.py
deleted file mode 100644
index 405ef1d..000
--- a/silverpop_export/tests/test_update.py
+++ /dev/null
@@ -1,204 +0,0 @@
-<<< HEAD   (d14d47 Merge branch 'master' into deploy)
-===
-import datetime
-from decimal import Decimal
-import mock
-import MySQLdb
-import os
-import warnings
-
-import database.db
-import silverpop_export.update
-
-conn = None
-db_name = None
-
-
-def setup():
-global conn
-global db_name
-# FIXME: parameterize test configuration better
-db_host = "127.0.0.1"
-db_pass = None
-if 'EXECUTOR_NUMBER' in os.environ:
-# We're running under Jenkins.  Assume things.
-db_name = "test"
-db_user = "root"
-else:
-db_name = "test"
-db_user = "test"
-
-db_params = {"user": db_user, "host": db_host}
-if db_pass:
-db_params['passwd'] = db_pass
-
-conn = database.db.Connection(**db_params)
-conn.execute("set default_storage_engine=memory")
-conn.execute("drop database if exists " + db_name)
-conn.execute("create database " + db_name)
-conn.db_conn.select_db(db_name)
-
-
-def test_test_setup():
-'''
-Set up the civcrm and export databases and run the update with no data.
-'''
-run_update_with_fixtures(fixture_queries=[])
-
-
-def test_duplicate():
-'''
-Test that we export one record for a duplicate contact.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0),
-(2, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1),
-(2);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select count(*) from silverpop_export")
-assert cursor.fetchone() == (1,)
-
-
-def test_refund_history():
-'''
-Test that we don't include refunded donations in a donor's history
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-""", """
-insert into civicrm_contribution (id, contact_id, receive_date, 
total_amount, trxn_id, contribution_status_id) values
-(1, 1, '2015-01-03', 15.25, 'xyz123', 1),
-(2, 1, '2016-05-05', 25.25, 'abc456', 9);
-""", """
-insert into wmf_contribution_extra (entity_id, original_amount, 
original_currency) values
-(1, 20.15, 'CAD'),
-(2, 35.15, 'CAD');
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select highest_usd_amount, lifetime_usd_total, 
donation_count, latest_currency, latest_native_amount, latest_usd_amount, 
latest_donation  from silverpop_export")
-expected = (Decimal('15.25'), Decimal('15.25'), 1, 'CAD', 
Decimal('20.15'), Decimal('15.25'), datetime.datetime(2015, 1, 3))
-assert cursor.fetchone() == expected
-
-
-def test_timezone():
-'''
-Test that we export timezone records where they exist
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0),
-(2, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1),
-(2);
-""", """
-insert into civicrm_country (id, iso_code) values
-(1, 'US');
-""", """
-insert into civicrm_address (contact_id, is_primary, country_id, 
postal_code, timezone) values
-(1, 1, 1, '10027', 'UTC-5');
-""", """
-insert into civicrm_contribution (id, contact_id, receive_date, 
total_amount, trxn_id, contribution_status_id) values
-(1, 1, '2015-01-03', 15.25, 'xyz123', 1),
-(2, 1, '2016-05-05', 25.25, 'abc456', 1);
-""", """
-insert into wmf_contribution_extra (entity_id, original_amount, 
original_currency) values
-(1, 20.15, 'USD'),
-(2, 35.15, 'USD');
-""", """
-insert into contribution_tracking (contribution_id, country) values
-(1, 'US'),
-(2, 'US');
-"""])
-
-cursor = conn.db_conn.cursor()
-

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-11-08 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320442

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

c734823 Fix missing timezone / postal code bug

Change-Id: I7bc8f074e4c84fca9718ee0f6dbf664169d1a673
---
D silverpop_export/tests/minimal_schema.sql
D silverpop_export/tests/test_update.py
2 files changed, 0 insertions(+), 293 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/42/320442/1

diff --git a/silverpop_export/tests/minimal_schema.sql 
b/silverpop_export/tests/minimal_schema.sql
deleted file mode 100644
index b4fa8fc..000
--- a/silverpop_export/tests/minimal_schema.sql
+++ /dev/null
@@ -1,119 +0,0 @@
-<<< HEAD   (7ff719 Merge branch 'master' into deploy)
-===
--- TODO: Do something SQLy to make *sure* we're not in a real database.
-
-drop table if exists civicrm_email;
-create table civicrm_email (
-id int(10) unsigned auto_increment primary key,
-contact_id int(10) unsigned,
-email varchar(254) COLLATE utf8_unicode_ci,
-is_primary tinyint(4) default '1',
-on_hold tinyint(4) default '0',
-key UI_email (email)
-);
-
-drop table if exists civicrm_contact;
-create table civicrm_contact (
-id int(10) unsigned auto_increment primary key,
-do_not_email tinyint(4) default '0',
-do_not_phone tinyint(4) default '0',
-do_not_mail tinyint(4) default '0',
-do_not_sms tinyint(4) default '0',
-do_not_trade tinyint(4) default '1',
-is_opt_out tinyint(4) default '0',
-preferred_language varchar(32) COLLATE utf8_unicode_ci,
-first_name varchar(64) COLLATE utf8_unicode_ci,
-middle_name varchar(64) COLLATE utf8_unicode_ci,
-last_name varchar(64) COLLATE utf8_unicode_ci,
-is_deleted tinyint(4) default '0'
-);
-
-drop table if exists wmf_donor;
-create table wmf_donor (
-id int(10) unsigned,
-entity_id int(10) unsigned,
-do_not_solicit tinyint(4),
-is_2006_donor tinyint(4),
-is_2007_donor tinyint(4),
-is_2008_donor tinyint(4),
-is_2009_donor tinyint(4),
-is_2010_donor tinyint(4),
-is_2011_donor tinyint(4),
-is_2012_donor tinyint(4),
-is_2013_donor tinyint(4),
-is_2014_donor tinyint(4),
-is_2015_donor tinyint(4),
-is_2016_donor tinyint(4),
-is_2017_donor tinyint(4),
-is_2018_donor tinyint(4),
-is_2019_donor tinyint(4),
-is_2020_donor tinyint(4),
-is_2021_donor tinyint(4),
-is_2022_donor tinyint(4),
-is_2023_donor tinyint(4),
-is_2024_donor tinyint(4),
-is_2025_donor tinyint(4),
-last_donation_date datetime,
-last_donation_currency varchar(255) COLLATE utf8_unicode_ci,
-last_donation_amount decimal(20,2),
-last_donation_usd decimal(20,2),
-lifetime_usd_total decimal(20,2)
-);
-
-drop table if exists civicrm_contribution;
-create table civicrm_contribution (
-id int(10) unsigned,
-contact_id int(10) unsigned,
-receive_date datetime,
-total_amount decimal(20,2),
-trxn_id varchar(255) COLLATE utf8_unicode_ci,
-contribution_status_id int(10) unsigned
-);
-
-drop table if exists civicrm_address;
-create table civicrm_address (
-id int(10) unsigned auto_increment primary key,
-contact_id int(10) unsigned,
-is_primary tinyint(4),
-city varchar(64) COLLATE utf8_unicode_ci,
-postal_code varchar(64) COLLATE utf8_unicode_ci,
-country_id int(10) unsigned,
-state_province_id int(10) unsigned,
-timezone varchar(8) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_country;
-create table civicrm_country (
-id int(10) unsigned,
-iso_code char(2) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_state_province;
-create table civicrm_state_province (
-  id int(10) unsigned,
-  name varchar(64) COLLATE utf8_unicode_ci
-);
-
-drop table if exists wmf_contribution_extra;
-create table wmf_contribution_extra (
-entity_id int(10) unsigned,
-original_amount decimal(20,2),
-original_currency varchar(255) COLLATE utf8_unicode_ci
-);
-
-drop table if exists contribution_tracking;
-create table contribution_tracking (
-contribution_id int(10) unsigned,
-country varchar(2)
-);
-
-drop table if exists log_civicrm_email;
-create table log_civicrm_email (
-email varchar(254) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_uf_match;
-create table civicrm_uf_match (
-uf_name varchar(128) COLLATE utf8_unicode_ci
-);
->>> BRANCH (c73482 Fix missing timezone / postal code bug)
diff --git a/silverpop_export/tests/test_update.py 
b/silverpop_export/tests/test_update.py
deleted file mode 100644
index 94a7118..000
--- a/silverpop_export/tests/test_update.py
+++ /dev/null
@@ -1,174 +0,0 @@
-<<< HEAD   (7ff719 Merge branch 'master' into deploy)
-===
-import datetime
-from decimal import Decimal
-import mock
-import MySQLdb
-import os
-import

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-11-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

c734823 Fix missing timezone / postal code bug

Change-Id: I7bc8f074e4c84fca9718ee0f6dbf664169d1a673
---
D silverpop_export/tests/minimal_schema.sql
D silverpop_export/tests/test_update.py
2 files changed, 0 insertions(+), 293 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/silverpop_export/tests/minimal_schema.sql 
b/silverpop_export/tests/minimal_schema.sql
deleted file mode 100644
index b4fa8fc..000
--- a/silverpop_export/tests/minimal_schema.sql
+++ /dev/null
@@ -1,119 +0,0 @@
-<<< HEAD   (7ff719 Merge branch 'master' into deploy)
-===
--- TODO: Do something SQLy to make *sure* we're not in a real database.
-
-drop table if exists civicrm_email;
-create table civicrm_email (
-id int(10) unsigned auto_increment primary key,
-contact_id int(10) unsigned,
-email varchar(254) COLLATE utf8_unicode_ci,
-is_primary tinyint(4) default '1',
-on_hold tinyint(4) default '0',
-key UI_email (email)
-);
-
-drop table if exists civicrm_contact;
-create table civicrm_contact (
-id int(10) unsigned auto_increment primary key,
-do_not_email tinyint(4) default '0',
-do_not_phone tinyint(4) default '0',
-do_not_mail tinyint(4) default '0',
-do_not_sms tinyint(4) default '0',
-do_not_trade tinyint(4) default '1',
-is_opt_out tinyint(4) default '0',
-preferred_language varchar(32) COLLATE utf8_unicode_ci,
-first_name varchar(64) COLLATE utf8_unicode_ci,
-middle_name varchar(64) COLLATE utf8_unicode_ci,
-last_name varchar(64) COLLATE utf8_unicode_ci,
-is_deleted tinyint(4) default '0'
-);
-
-drop table if exists wmf_donor;
-create table wmf_donor (
-id int(10) unsigned,
-entity_id int(10) unsigned,
-do_not_solicit tinyint(4),
-is_2006_donor tinyint(4),
-is_2007_donor tinyint(4),
-is_2008_donor tinyint(4),
-is_2009_donor tinyint(4),
-is_2010_donor tinyint(4),
-is_2011_donor tinyint(4),
-is_2012_donor tinyint(4),
-is_2013_donor tinyint(4),
-is_2014_donor tinyint(4),
-is_2015_donor tinyint(4),
-is_2016_donor tinyint(4),
-is_2017_donor tinyint(4),
-is_2018_donor tinyint(4),
-is_2019_donor tinyint(4),
-is_2020_donor tinyint(4),
-is_2021_donor tinyint(4),
-is_2022_donor tinyint(4),
-is_2023_donor tinyint(4),
-is_2024_donor tinyint(4),
-is_2025_donor tinyint(4),
-last_donation_date datetime,
-last_donation_currency varchar(255) COLLATE utf8_unicode_ci,
-last_donation_amount decimal(20,2),
-last_donation_usd decimal(20,2),
-lifetime_usd_total decimal(20,2)
-);
-
-drop table if exists civicrm_contribution;
-create table civicrm_contribution (
-id int(10) unsigned,
-contact_id int(10) unsigned,
-receive_date datetime,
-total_amount decimal(20,2),
-trxn_id varchar(255) COLLATE utf8_unicode_ci,
-contribution_status_id int(10) unsigned
-);
-
-drop table if exists civicrm_address;
-create table civicrm_address (
-id int(10) unsigned auto_increment primary key,
-contact_id int(10) unsigned,
-is_primary tinyint(4),
-city varchar(64) COLLATE utf8_unicode_ci,
-postal_code varchar(64) COLLATE utf8_unicode_ci,
-country_id int(10) unsigned,
-state_province_id int(10) unsigned,
-timezone varchar(8) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_country;
-create table civicrm_country (
-id int(10) unsigned,
-iso_code char(2) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_state_province;
-create table civicrm_state_province (
-  id int(10) unsigned,
-  name varchar(64) COLLATE utf8_unicode_ci
-);
-
-drop table if exists wmf_contribution_extra;
-create table wmf_contribution_extra (
-entity_id int(10) unsigned,
-original_amount decimal(20,2),
-original_currency varchar(255) COLLATE utf8_unicode_ci
-);
-
-drop table if exists contribution_tracking;
-create table contribution_tracking (
-contribution_id int(10) unsigned,
-country varchar(2)
-);
-
-drop table if exists log_civicrm_email;
-create table log_civicrm_email (
-email varchar(254) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_uf_match;
-create table civicrm_uf_match (
-uf_name varchar(128) COLLATE utf8_unicode_ci
-);
->>> BRANCH (c73482 Fix missing timezone / postal code bug)
diff --git a/silverpop_export/tests/test_update.py 
b/silverpop_export/tests/test_update.py
deleted file mode 100644
index 94a7118..000
--- a/silverpop_export/tests/test_update.py
+++ /dev/null
@@ -1,174 +0,0 @@
-<<< HEAD   (7ff719 Merge branch 'master' into deploy)
-===
-import datetime
-from decimal import Decimal
-import mock
-import MySQLdb
-import os
-import warnings
-
-import database.db
-import

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-11-02 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

And delete tests

b876678 Fix couple blank lines in silverpop_export test
3e62739 Add timezone column to export

Change-Id: Id34d11bf3fb150fe99c0ae08af6122878846aa1b
---
D silverpop_export/tests/minimal_schema.sql
D silverpop_export/tests/test_update.py
2 files changed, 0 insertions(+), 247 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/silverpop_export/tests/minimal_schema.sql 
b/silverpop_export/tests/minimal_schema.sql
deleted file mode 100644
index 4f8682a..000
--- a/silverpop_export/tests/minimal_schema.sql
+++ /dev/null
@@ -1,115 +0,0 @@
--- TODO: Do something SQLy to make *sure* we're not in a real database.
-
-drop table if exists civicrm_email;
-create table civicrm_email (
-id int(10) unsigned auto_increment primary key,
-contact_id int(10) unsigned,
-email varchar(254) COLLATE utf8_unicode_ci,
-is_primary tinyint(4) default '1',
-on_hold tinyint(4) default '0',
-key UI_email (email)
-);
-
-drop table if exists civicrm_contact;
-create table civicrm_contact (
-id int(10) unsigned auto_increment primary key,
-do_not_email tinyint(4) default '0',
-do_not_phone tinyint(4) default '0',
-do_not_mail tinyint(4) default '0',
-do_not_sms tinyint(4) default '0',
-do_not_trade tinyint(4) default '1',
-is_opt_out tinyint(4) default '0',
-preferred_language varchar(32) COLLATE utf8_unicode_ci,
-first_name varchar(64) COLLATE utf8_unicode_ci,
-middle_name varchar(64) COLLATE utf8_unicode_ci,
-last_name varchar(64) COLLATE utf8_unicode_ci,
-is_deleted tinyint(4) default '0'
-);
-
-drop table if exists wmf_donor;
-create table wmf_donor (
-id int(10) unsigned,
-entity_id int(10) unsigned,
-do_not_solicit tinyint(4),
-is_2006_donor tinyint(4),
-is_2007_donor tinyint(4),
-is_2008_donor tinyint(4),
-is_2009_donor tinyint(4),
-is_2010_donor tinyint(4),
-is_2011_donor tinyint(4),
-is_2012_donor tinyint(4),
-is_2013_donor tinyint(4),
-is_2014_donor tinyint(4),
-is_2015_donor tinyint(4),
-is_2016_donor tinyint(4),
-is_2017_donor tinyint(4),
-is_2018_donor tinyint(4),
-is_2019_donor tinyint(4),
-is_2020_donor tinyint(4),
-is_2021_donor tinyint(4),
-is_2022_donor tinyint(4),
-is_2023_donor tinyint(4),
-is_2024_donor tinyint(4),
-is_2025_donor tinyint(4),
-last_donation_date datetime,
-last_donation_currency varchar(255) COLLATE utf8_unicode_ci,
-last_donation_amount decimal(20,2),
-last_donation_usd decimal(20,2),
-lifetime_usd_total decimal(20,2)
-);
-
-drop table if exists civicrm_contribution;
-create table civicrm_contribution (
-id int(10) unsigned,
-contact_id int(10) unsigned,
-receive_date datetime,
-total_amount decimal(20,2),
-trxn_id varchar(255) COLLATE utf8_unicode_ci,
-contribution_status_id int(10) unsigned
-);
-
-drop table if exists civicrm_address;
-create table civicrm_address (
-contact_id int(10) unsigned,
-is_primary tinyint(4),
-city varchar(64) COLLATE utf8_unicode_ci,
-postal_code varchar(64) COLLATE utf8_unicode_ci,
-country_id int(10) unsigned,
-state_province_id int(10) unsigned,
-timezone varchar(8) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_country;
-create table civicrm_country (
-id int(10) unsigned,
-iso_code char(2) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_state_province;
-create table civicrm_state_province (
-  id int(10) unsigned,
-  name varchar(64) COLLATE utf8_unicode_ci
-);
-
-drop table if exists wmf_contribution_extra;
-create table wmf_contribution_extra (
-entity_id int(10) unsigned,
-original_amount decimal(20,2),
-original_currency varchar(255) COLLATE utf8_unicode_ci
-);
-
-drop table if exists contribution_tracking;
-create table contribution_tracking (
-contribution_id int(10) unsigned,
-country varchar(2)
-);
-
-drop table if exists log_civicrm_email;
-create table log_civicrm_email (
-email varchar(254) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_uf_match;
-create table civicrm_uf_match (
-uf_name varchar(128) COLLATE utf8_unicode_ci
-);
diff --git a/silverpop_export/tests/test_update.py 
b/silverpop_export/tests/test_update.py
deleted file mode 100644
index a8d6440..000
--- a/silverpop_export/tests/test_update.py
+++ /dev/null
@@ -1,132 +0,0 @@
-import datetime
-from decimal import Decimal
-import mock
-import MySQLdb
-import os
-import warnings
-
-import database.db
-import silverpop_export.update
-
-conn = None
-db_name = None
-
-
-def setup():
-global conn
-global db_name
-# FIXME: parameterize test configuration better
-db_host = "127.0.0.1"
-db_pass =

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-11-02 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/319395

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

And delete tests

b876678 Fix couple blank lines in silverpop_export test
3e62739 Add timezone column to export

Change-Id: Id34d11bf3fb150fe99c0ae08af6122878846aa1b
---
D silverpop_export/tests/minimal_schema.sql
D silverpop_export/tests/test_update.py
2 files changed, 0 insertions(+), 247 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/95/319395/1

diff --git a/silverpop_export/tests/minimal_schema.sql 
b/silverpop_export/tests/minimal_schema.sql
deleted file mode 100644
index 4f8682a..000
--- a/silverpop_export/tests/minimal_schema.sql
+++ /dev/null
@@ -1,115 +0,0 @@
--- TODO: Do something SQLy to make *sure* we're not in a real database.
-
-drop table if exists civicrm_email;
-create table civicrm_email (
-id int(10) unsigned auto_increment primary key,
-contact_id int(10) unsigned,
-email varchar(254) COLLATE utf8_unicode_ci,
-is_primary tinyint(4) default '1',
-on_hold tinyint(4) default '0',
-key UI_email (email)
-);
-
-drop table if exists civicrm_contact;
-create table civicrm_contact (
-id int(10) unsigned auto_increment primary key,
-do_not_email tinyint(4) default '0',
-do_not_phone tinyint(4) default '0',
-do_not_mail tinyint(4) default '0',
-do_not_sms tinyint(4) default '0',
-do_not_trade tinyint(4) default '1',
-is_opt_out tinyint(4) default '0',
-preferred_language varchar(32) COLLATE utf8_unicode_ci,
-first_name varchar(64) COLLATE utf8_unicode_ci,
-middle_name varchar(64) COLLATE utf8_unicode_ci,
-last_name varchar(64) COLLATE utf8_unicode_ci,
-is_deleted tinyint(4) default '0'
-);
-
-drop table if exists wmf_donor;
-create table wmf_donor (
-id int(10) unsigned,
-entity_id int(10) unsigned,
-do_not_solicit tinyint(4),
-is_2006_donor tinyint(4),
-is_2007_donor tinyint(4),
-is_2008_donor tinyint(4),
-is_2009_donor tinyint(4),
-is_2010_donor tinyint(4),
-is_2011_donor tinyint(4),
-is_2012_donor tinyint(4),
-is_2013_donor tinyint(4),
-is_2014_donor tinyint(4),
-is_2015_donor tinyint(4),
-is_2016_donor tinyint(4),
-is_2017_donor tinyint(4),
-is_2018_donor tinyint(4),
-is_2019_donor tinyint(4),
-is_2020_donor tinyint(4),
-is_2021_donor tinyint(4),
-is_2022_donor tinyint(4),
-is_2023_donor tinyint(4),
-is_2024_donor tinyint(4),
-is_2025_donor tinyint(4),
-last_donation_date datetime,
-last_donation_currency varchar(255) COLLATE utf8_unicode_ci,
-last_donation_amount decimal(20,2),
-last_donation_usd decimal(20,2),
-lifetime_usd_total decimal(20,2)
-);
-
-drop table if exists civicrm_contribution;
-create table civicrm_contribution (
-id int(10) unsigned,
-contact_id int(10) unsigned,
-receive_date datetime,
-total_amount decimal(20,2),
-trxn_id varchar(255) COLLATE utf8_unicode_ci,
-contribution_status_id int(10) unsigned
-);
-
-drop table if exists civicrm_address;
-create table civicrm_address (
-contact_id int(10) unsigned,
-is_primary tinyint(4),
-city varchar(64) COLLATE utf8_unicode_ci,
-postal_code varchar(64) COLLATE utf8_unicode_ci,
-country_id int(10) unsigned,
-state_province_id int(10) unsigned,
-timezone varchar(8) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_country;
-create table civicrm_country (
-id int(10) unsigned,
-iso_code char(2) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_state_province;
-create table civicrm_state_province (
-  id int(10) unsigned,
-  name varchar(64) COLLATE utf8_unicode_ci
-);
-
-drop table if exists wmf_contribution_extra;
-create table wmf_contribution_extra (
-entity_id int(10) unsigned,
-original_amount decimal(20,2),
-original_currency varchar(255) COLLATE utf8_unicode_ci
-);
-
-drop table if exists contribution_tracking;
-create table contribution_tracking (
-contribution_id int(10) unsigned,
-country varchar(2)
-);
-
-drop table if exists log_civicrm_email;
-create table log_civicrm_email (
-email varchar(254) COLLATE utf8_unicode_ci
-);
-
-drop table if exists civicrm_uf_match;
-create table civicrm_uf_match (
-uf_name varchar(128) COLLATE utf8_unicode_ci
-);
diff --git a/silverpop_export/tests/test_update.py 
b/silverpop_export/tests/test_update.py
deleted file mode 100644
index a8d6440..000
--- a/silverpop_export/tests/test_update.py
+++ /dev/null
@@ -1,132 +0,0 @@
-import datetime
-from decimal import Decimal
-import mock
-import MySQLdb
-import os
-import warnings
-
-import database.db
-import silverpop_export.update
-
-conn = None
-db_name = None
-
-
-def setup():
-global conn
-global db_name
-# FIXME: parameterize test

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-10-21 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/317169

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

808c307 sftp client needs to get_config before connect

Change-Id: Ia533ba2e04f75fb127306b6a8572d7f494ea23cd
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/69/317169/1


-- 
To view, visit https://gerrit.wikimedia.org/r/317169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia533ba2e04f75fb127306b6a8572d7f494ea23cd
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-10-21 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

808c307 sftp client needs to get_config before connect

Change-Id: Ia533ba2e04f75fb127306b6a8572d7f494ea23cd
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/317169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia533ba2e04f75fb127306b6a8572d7f494ea23cd
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-10-20 Thread Ejegg (Code Review) 
Ejegg has submitted this change and it was merged.

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

f88eff8 Shuffle config usages around to be less of a jerk
db39e0b Enable flake8 tests
fcf1e6b Regression test for T143903
9411132 Tests for the bulk export
58da983 Fix python tests
7257815 Filter refunds out of donation history

Change-Id: I0dfee19b05291bf9d64c0ba01f5cde458e3efe01
---
D queue/tests/test_redis_wrap.py
1 file changed, 0 insertions(+), 64 deletions(-)

Approvals:
  Ejegg: Verified; Looks good to me, approved



diff --git a/queue/tests/test_redis_wrap.py b/queue/tests/test_redis_wrap.py
deleted file mode 100644
index 5d3b7e7..000
--- a/queue/tests/test_redis_wrap.py
+++ /dev/null
@@ -1,64 +0,0 @@
-<<< HEAD   (f6d200 Merge branch 'master' into deploy)
-===
-import json
-import mock
-from queue.redis_wrap import Redis
-
-# TODO:
-# Test source_meta
-
-
-@mock.patch("redis.Redis")
-@mock.patch("process.globals")
-def test_send(MockGlobals, MockPyRedis):
-'''
-Data is sent to the queue undisturbed.
-'''
-MockGlobals.get_config.return_value.no_effect = False
-MockGlobals.get_config.return_value.redis.queues = {}
-
-test_queue = "test_queue"
-data = dict(a=2)
-
-Redis().send(test_queue, data)
-
-calls = MockPyRedis().rpush.mock_calls
-assert len(calls) == 1
-# FIXME: indexen arcana.
-actual_message_encoded = calls[0][1][1]
-actual_msg = json.loads(actual_message_encoded)
-assert actual_msg['a'] == 2
-
-
-@mock.patch("time.time")
-@mock.patch("sys.argv")
-@mock.patch("os.getpid")
-@mock.patch("socket.gethostname")
-@mock.patch("redis.Redis")
-@mock.patch("process.globals")
-def test_source_meta(MockGlobals, MockPyRedis, MockHostname, MockPid, 
MockArgv, MockTime):
-'''
-Source meta fields are built correctly
-'''
-MockGlobals.get_config.return_value.no_effect = False
-MockGlobals.get_config.return_value.redis.queues = {}
-MockHostname.return_value = "localhost-test"
-MockPid.return_value = 123
-# Can't use __file__ because of .py vs .pyc on Python 2.
-MockArgv.__getitem__.return_value = "test_redis_wrap"
-MockTime.return_value = 1476388000
-
-test_queue = "test_queue"
-data = dict(a=1)
-
-expected = {"a": 1, "source_name": "test_redis_wrap", "source_version": 
"unknown", "source_enqueued_time": 1476388000, "source_host": "localhost-test", 
"source_run_id": 123, "source_type": "audit"}
-
-Redis().send(test_queue, data)
-
-calls = MockPyRedis().rpush.mock_calls
-assert len(calls) == 1
-# FIXME: indexen arcana.
-actual_message_encoded = calls[0][1][1]
-actual_msg = json.loads(actual_message_encoded)
-assert actual_msg == expected
->>> BRANCH (725781 Filter refunds out of donation history)

-- 
To view, visit https://gerrit.wikimedia.org/r/317044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0dfee19b05291bf9d64c0ba01f5cde458e3efe01
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-10-20 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/317044

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

f88eff8 Shuffle config usages around to be less of a jerk
db39e0b Enable flake8 tests
fcf1e6b Regression test for T143903
9411132 Tests for the bulk export
58da983 Fix python tests
7257815 Filter refunds out of donation history

Change-Id: I0dfee19b05291bf9d64c0ba01f5cde458e3efe01
---
D queue/tests/test_redis_wrap.py
1 file changed, 0 insertions(+), 64 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/44/317044/1

diff --git a/queue/tests/test_redis_wrap.py b/queue/tests/test_redis_wrap.py
deleted file mode 100644
index 5d3b7e7..000
--- a/queue/tests/test_redis_wrap.py
+++ /dev/null
@@ -1,64 +0,0 @@
-<<< HEAD   (f6d200 Merge branch 'master' into deploy)
-===
-import json
-import mock
-from queue.redis_wrap import Redis
-
-# TODO:
-# Test source_meta
-
-
-@mock.patch("redis.Redis")
-@mock.patch("process.globals")
-def test_send(MockGlobals, MockPyRedis):
-'''
-Data is sent to the queue undisturbed.
-'''
-MockGlobals.get_config.return_value.no_effect = False
-MockGlobals.get_config.return_value.redis.queues = {}
-
-test_queue = "test_queue"
-data = dict(a=2)
-
-Redis().send(test_queue, data)
-
-calls = MockPyRedis().rpush.mock_calls
-assert len(calls) == 1
-# FIXME: indexen arcana.
-actual_message_encoded = calls[0][1][1]
-actual_msg = json.loads(actual_message_encoded)
-assert actual_msg['a'] == 2
-
-
-@mock.patch("time.time")
-@mock.patch("sys.argv")
-@mock.patch("os.getpid")
-@mock.patch("socket.gethostname")
-@mock.patch("redis.Redis")
-@mock.patch("process.globals")
-def test_source_meta(MockGlobals, MockPyRedis, MockHostname, MockPid, 
MockArgv, MockTime):
-'''
-Source meta fields are built correctly
-'''
-MockGlobals.get_config.return_value.no_effect = False
-MockGlobals.get_config.return_value.redis.queues = {}
-MockHostname.return_value = "localhost-test"
-MockPid.return_value = 123
-# Can't use __file__ because of .py vs .pyc on Python 2.
-MockArgv.__getitem__.return_value = "test_redis_wrap"
-MockTime.return_value = 1476388000
-
-test_queue = "test_queue"
-data = dict(a=1)
-
-expected = {"a": 1, "source_name": "test_redis_wrap", "source_version": 
"unknown", "source_enqueued_time": 1476388000, "source_host": "localhost-test", 
"source_run_id": 123, "source_type": "audit"}
-
-Redis().send(test_queue, data)
-
-calls = MockPyRedis().rpush.mock_calls
-assert len(calls) == 1
-# FIXME: indexen arcana.
-actual_message_encoded = calls[0][1][1]
-actual_msg = json.loads(actual_message_encoded)
-assert actual_msg == expected
->>> BRANCH (725781 Filter refunds out of donation history)

-- 
To view, visit https://gerrit.wikimedia.org/r/317044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0dfee19b05291bf9d64c0ba01f5cde458e3efe01
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-10-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

15d7190 Fix a few timestamps in audit messages

Change-Id: Ic622a55eebecc1b9150e606b16dac2e410f747a8
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/315542
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic622a55eebecc1b9150e606b16dac2e410f747a8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-10-12 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315542

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

15d7190 Fix a few timestamps in audit messages

Change-Id: Ic622a55eebecc1b9150e606b16dac2e410f747a8
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/42/315542/1


-- 
To view, visit https://gerrit.wikimedia.org/r/315542
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic622a55eebecc1b9150e606b16dac2e410f747a8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-10-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

a5a5e64 Add order_id to paypal audit donations
ac7318a Add source_ fields BEFORE encoding to js

Change-Id: I2ad466fe2de33e250c33e68cd2a951df5f70864b
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/315448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ad466fe2de33e250c33e68cd2a951df5f70864b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-10-11 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315448

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

a5a5e64 Add order_id to paypal audit donations
ac7318a Add source_ fields BEFORE encoding to js

Change-Id: I2ad466fe2de33e250c33e68cd2a951df5f70864b
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/48/315448/1


-- 
To view, visit https://gerrit.wikimedia.org/r/315448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ad466fe2de33e250c33e68cd2a951df5f70864b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-10-11 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315436

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

9b24337 One more missing import :S

Change-Id: I9a77630d8cd1500f939f8f8c2015240b6c615c12
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/36/315436/1


-- 
To view, visit https://gerrit.wikimedia.org/r/315436
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a77630d8cd1500f939f8f8c2015240b6c615c12
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-10-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

9b24337 One more missing import :S

Change-Id: I9a77630d8cd1500f939f8f8c2015240b6c615c12
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/315436
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a77630d8cd1500f939f8f8c2015240b6c615c12
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-10-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

aa7090d Add missing import statements

Change-Id: I464c4be9b4edc28cf0fe1adef7dee934923b7f64
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/315434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I464c4be9b4edc28cf0fe1adef7dee934923b7f64
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-10-11 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315434

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

aa7090d Add missing import statements

Change-Id: I464c4be9b4edc28cf0fe1adef7dee934923b7f64
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/34/315434/1


-- 
To view, visit https://gerrit.wikimedia.org/r/315434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I464c4be9b4edc28cf0fe1adef7dee934923b7f64
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-10-11 Thread Ejegg (Code Review) 
Ejegg has submitted this change and it was merged.

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

And delete tests

c7095e7 Remove unused dedupe module
643ccde Rename a -_test file to avoid nose autodiscovery
2dd4dd0 Some tests
a3f3493 Remove unused WorldPay audit module
6a603d2 Mindlessly fix flake8 things
f1a7fbf Add source fields to Redis audit messages

Change-Id: I23d3906260645e4c0ebf1c090d4ac699f6eec52f
---
D queue/tests/__init__.py
D queue/tests/test_redis_wrap.py
D queue/tests/test_stomp_wrap.py
D test-requirements.txt
D tests/test_yaml_lint.py
5 files changed, 0 insertions(+), 52 deletions(-)

Approvals:
  Ejegg: Verified; Looks good to me, approved



diff --git a/queue/tests/__init__.py b/queue/tests/__init__.py
deleted file mode 100644
index e69de29..000
--- a/queue/tests/__init__.py
+++ /dev/null
diff --git a/queue/tests/test_redis_wrap.py b/queue/tests/test_redis_wrap.py
deleted file mode 100644
index 3f86185..000
--- a/queue/tests/test_redis_wrap.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from mock import patch
-
-test_queue = "test_queue"
-
-
-@patch("redis.Redis")
-def test_send(MockPyRedis):
-data = dict(a=1)
-
-with patch("process.globals") as MockGlobals:
-MockGlobals.get_config.return_value.no_effect = False
-MockGlobals.get_config.return_value.redis.queues = {}
-
-from queue.redis_wrap import Redis
-Redis().send(test_queue, data)
-
-expected_encoded = '{"a": 1}'
-MockPyRedis().rpush.assert_called_once_with(test_queue, expected_encoded)
diff --git a/queue/tests/test_stomp_wrap.py b/queue/tests/test_stomp_wrap.py
deleted file mode 100644
index 3bf2d20..000
--- a/queue/tests/test_stomp_wrap.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import time
-
-from queue.stomp_wrap import Stomp
-
-
-def test_source_meta():
-meta = Stomp.source_meta()
-assert meta['source_name'] is not None
-assert 'audit' == meta['source_type']
-assert int(meta['source_run_id']) > 0
-assert meta['source_version'] is not None
-assert meta['source_enqueued_time'] >= (time.time() - 60)
-assert meta['source_host'] is not None
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index 18bcddc..000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-mock
-nose
diff --git a/tests/test_yaml_lint.py b/tests/test_yaml_lint.py
deleted file mode 100644
index 0feeef8..000
--- a/tests/test_yaml_lint.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import os.path
-import yaml
-
-
-def test_valid_yaml():
-basedir = os.path.realpath(os.path.join(__file__, '..', '..'))
-yaml_files = []
-for dirpath, dirnames, filenames in os.walk(basedir):
-yaml_files.extend(
-[os.path.join(dirpath, f) for f in filenames
- if f.endswith('.yaml') or f.endswith('.yaml.example')]
-)
-for yaml_file in yaml_files:
-yield is_valid_yaml, yaml_file
-
-
-def is_valid_yaml(filename):
-with open(filename, 'r') as f:
-yaml.safe_load(f)

-- 
To view, visit https://gerrit.wikimedia.org/r/315396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I23d3906260645e4c0ebf1c090d4ac699f6eec52f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-10-11 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315396

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

And delete tests

c7095e7 Remove unused dedupe module
643ccde Rename a -_test file to avoid nose autodiscovery
2dd4dd0 Some tests
a3f3493 Remove unused WorldPay audit module
6a603d2 Mindlessly fix flake8 things
f1a7fbf Add source fields to Redis audit messages

Change-Id: I23d3906260645e4c0ebf1c090d4ac699f6eec52f
---
D queue/tests/__init__.py
D queue/tests/test_redis_wrap.py
D queue/tests/test_stomp_wrap.py
D test-requirements.txt
D tests/test_yaml_lint.py
5 files changed, 0 insertions(+), 52 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/96/315396/1

diff --git a/queue/tests/__init__.py b/queue/tests/__init__.py
deleted file mode 100644
index e69de29..000
--- a/queue/tests/__init__.py
+++ /dev/null
diff --git a/queue/tests/test_redis_wrap.py b/queue/tests/test_redis_wrap.py
deleted file mode 100644
index 3f86185..000
--- a/queue/tests/test_redis_wrap.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from mock import patch
-
-test_queue = "test_queue"
-
-
-@patch("redis.Redis")
-def test_send(MockPyRedis):
-data = dict(a=1)
-
-with patch("process.globals") as MockGlobals:
-MockGlobals.get_config.return_value.no_effect = False
-MockGlobals.get_config.return_value.redis.queues = {}
-
-from queue.redis_wrap import Redis
-Redis().send(test_queue, data)
-
-expected_encoded = '{"a": 1}'
-MockPyRedis().rpush.assert_called_once_with(test_queue, expected_encoded)
diff --git a/queue/tests/test_stomp_wrap.py b/queue/tests/test_stomp_wrap.py
deleted file mode 100644
index 3bf2d20..000
--- a/queue/tests/test_stomp_wrap.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import time
-
-from queue.stomp_wrap import Stomp
-
-
-def test_source_meta():
-meta = Stomp.source_meta()
-assert meta['source_name'] is not None
-assert 'audit' == meta['source_type']
-assert int(meta['source_run_id']) > 0
-assert meta['source_version'] is not None
-assert meta['source_enqueued_time'] >= (time.time() - 60)
-assert meta['source_host'] is not None
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index 18bcddc..000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-mock
-nose
diff --git a/tests/test_yaml_lint.py b/tests/test_yaml_lint.py
deleted file mode 100644
index 0feeef8..000
--- a/tests/test_yaml_lint.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import os.path
-import yaml
-
-
-def test_valid_yaml():
-basedir = os.path.realpath(os.path.join(__file__, '..', '..'))
-yaml_files = []
-for dirpath, dirnames, filenames in os.walk(basedir):
-yaml_files.extend(
-[os.path.join(dirpath, f) for f in filenames
- if f.endswith('.yaml') or f.endswith('.yaml.example')]
-)
-for yaml_file in yaml_files:
-yield is_valid_yaml, yaml_file
-
-
-def is_valid_yaml(filename):
-with open(filename, 'r') as f:
-yaml.safe_load(f)

-- 
To view, visit https://gerrit.wikimedia.org/r/315396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I23d3906260645e4c0ebf1c090d4ac699f6eec52f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-10-06 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/314602

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

7c03150 JSON-encode stuff before giving to Redis

Change-Id: I953d1b8e9bd59c43b7b54a35d7ec298bdb3e24f8
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/02/314602/1


-- 
To view, visit https://gerrit.wikimedia.org/r/314602
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I953d1b8e9bd59c43b7b54a35d7ec298bdb3e24f8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-08-02 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

Change-Id: I8e97baf558396d74f1d5fd5ee4cd3490ced4550c
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/302442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e97baf558396d74f1d5fd5ee4cd3490ced4550c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

2016-08-02 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/302442

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

Change-Id: I8e97baf558396d74f1d5fd5ee4cd3490ced4550c
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/42/302442/1


-- 
To view, visit https://gerrit.wikimedia.org/r/302442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e97baf558396d74f1d5fd5ee4cd3490ced4550c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits