Stefan.petrea has uploaded a new change for review.
https://gerrit.wikimedia.org/r/62422
Change subject: Fixing mingle 358
......................................................................
Fixing mingle 358
* Started writing test for card 358 but because bug report is still
unclear, this hasn't been wrapped up yet.
Change-Id: I80437008d508a13825556bbdad0361a76b38d0c8
---
A squids/t/12-regression-fix-mingle-358.t
M squids/t/CommonConfig.pm
A squids/testdata/regression-fix-mingle-358/SquidCountArchiveConfig.pm
A squids/testdata/regression-fix-mingle-358/SquidReportArchiveConfig.pm
4 files changed, 129 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikistats
refs/changes/22/62422/1
diff --git a/squids/t/12-regression-fix-mingle-358.t
b/squids/t/12-regression-fix-mingle-358.t
new file mode 100644
index 0000000..24f15ae
--- /dev/null
+++ b/squids/t/12-regression-fix-mingle-358.t
@@ -0,0 +1,88 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Test::More qw/no_plan/;
+require 't/CommonConfig.pm';
+use lib "testdata/regression-fix-mingle-358";
+use SquidReportArchiveConfig;
+use Carp;
+use lib "./t";
+use Generate::Squid;
+use List::Util qw/sum/;
+
+
+#
+#
+# Status: Stalled due to ambigous bug report
+#
+# Plan: Once we know what the acceptance criteria is for mingle card 358 ,
we'll know what to test for
+#
+#
+
+our $__DATA_BASE;
+our $__CODE_BASE;
+
+my $o = Generate::Squid->new({
+ start_date => "2012-09-30" ,
+ prefix => "sampled-1000.log-" ,
+ output_dir => "$__DATA_BASE",
+});
+
+$o->generate_line({ geocode=>"--" });
+$o->__increase_day;
+$o->generate_line({ geocode=>"CA" }) for 1..100;
+$o->generate_line({ geocode=>"US" }) for 1..60;
+$o->generate_line({ geocode=>"BR" }) for 1..40;
+$o->generate_line({ geocode=>"BE" }) for 1..30;
+$o->generate_line({ geocode=>"NL" }) for 1..30;
+$o->__increase_day;
+$o->generate_line({ geocode=>"--" });
+$o->dump_to_disk_and_increase_day;
+
+
+
+my $wikistats_run_cmd = qq{
+
+ cd $__DATA_BASE;
+ rm -f sampled-1000.log*.gz
+ ls sampled-1000.log* | xargs gzip;
+ cd $__CODE_BASE;
+
+ echo "FINISHED gzip";
+
+ rm -rf $__DATA_BASE/csv/;
+ rm -rf $__DATA_BASE/reports/;
+ rm -rf $__DATA_BASE/logs/;
+
+ echo "FINISHED cleaning";
+
+ mkdir $__DATA_BASE/csv/;
+ ln -s ../../../csv/meta $__DATA_BASE/csv/meta;
+
+ echo "FINISHED cleaning 2";
+
+ ########################
+ # Run Count Archive
+ ########################
+ nice perl \\
+ -I ./perl \\
+ perl/SquidCountArchive.pl \\
+ -d 2012/10/01-2012/10/01 \\
+ -r $__DATA_BASE/SquidCountArchiveConfig.pm \\
+ -p 2>&1;
+
+ echo "FINISHED counting";
+ ########################
+ # Make the reports
+ ########################
+ nice perl perl/SquidReportArchive.pl \\
+ -r $__DATA_BASE/SquidReportArchiveConfig.pm \\
+ -m 2012-10 \\
+ -p 2>&1;
+};
+
+my $wikistats_run_cmd_output = `$wikistats_run_cmd`;
+#warn $wikistats_run_cmd_output;
+
+
+ok(1,"This test always succeeds");
diff --git a/squids/t/CommonConfig.pm b/squids/t/CommonConfig.pm
index 224441d..367e5e9 100644
--- a/squids/t/CommonConfig.pm
+++ b/squids/t/CommonConfig.pm
@@ -12,18 +12,21 @@
#
my $hostname = `hostname`;
+my $pwd = `pwd`;
chomp $hostname;
our $__CODE_BASE;
if($hostname eq "gallium") {
# Running on Jenkins
- $__CODE_BASE = "/var/lib/jenkins/jobs/analytics-wikistats/workspace/squids";
+ $__CODE_BASE = $ENV{WORKSPACE}."/squids";
} elsif($hostname eq "stat1" && $ENV{HOME} eq "/home/ezachte") {
# Running on Erik's account on stat1
$__CODE_BASE = "/home/ezachte/wikistats/squids";
} elsif($hostname eq "stat1" && $ENV{HOME} eq "/home/diederik") {
# Running on Diederik's account on stat1
$__CODE_BASE = "/home/diederik/wikistats/squids";
+} elsif($pwd =~ /\/travis\//) {
+ $__CODE_BASE = "/home/travis/build/wsdookadr/analytics-wikistats/squids";
} else {
# Anywhere else
$__CODE_BASE = "/a/wikistats_git/squids";
diff --git
a/squids/testdata/regression-fix-mingle-358/SquidCountArchiveConfig.pm
b/squids/testdata/regression-fix-mingle-358/SquidCountArchiveConfig.pm
new file mode 100644
index 0000000..39ed37c
--- /dev/null
+++ b/squids/testdata/regression-fix-mingle-358/SquidCountArchiveConfig.pm
@@ -0,0 +1,16 @@
+#!/usr/bin/perl
+require 't/CommonConfig.pm';
+
+$__DATA_BASE = "$__CODE_BASE/testdata/regression-fix-mingle-358";
+#no tracing
+$trace_on_exit = $false;
+$trace_on_exit_verbose = $false;
+$trace_on_exit_concise = $false;
+
+$cfg_liblocation = "$__CODE_BASE/perl" ;
+$squids = "$__CODE_BASE" ;
+
+$cfg_path_root_production = "$__DATA_BASE/csv" ;
+$cfg_dir_in_production = "$__DATA_BASE" ;
+
+$cfg_logname = "sampled-1000.log" ;
diff --git
a/squids/testdata/regression-fix-mingle-358/SquidReportArchiveConfig.pm
b/squids/testdata/regression-fix-mingle-358/SquidReportArchiveConfig.pm
new file mode 100644
index 0000000..52f9109
--- /dev/null
+++ b/squids/testdata/regression-fix-mingle-358/SquidReportArchiveConfig.pm
@@ -0,0 +1,21 @@
+#!/usr/bin/perl
+require 't/CommonConfig.pm';
+
+$__DATA_BASE = "$__CODE_BASE/testdata/regression-fix-mingle-358";
+#no tracing
+$trace_on_exit = $false;
+$trace_on_exit_verbose = $false;
+$trace_on_exit_concise = $false;
+
+# Code configuration
+$cfg_liblocation = "$__CODE_BASE/perl" ;
+$squids = "$__CODE_BASE" ;
+
+
+# Data configuration
+
+$cfg_path_csv = "$__DATA_BASE/csv" ;
+$cfg_path_reports = "$__DATA_BASE/reports" ;
+$cfg_path_log = "$__DATA_BASE/logs" ;
+
+$cfg_default_argv = "-m 2011-08" ; # monthly report
--
To view, visit https://gerrit.wikimedia.org/r/62422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80437008d508a13825556bbdad0361a76b38d0c8
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikistats
Gerrit-Branch: master
Gerrit-Owner: Stefan.petrea <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
