Merge branch 'master' into feature/will/ci-lettuce-tests

Resolved conflict with changes to Rakefile in master

Conflicts:
	rakefile

rakefiles/tests.rake

@@ -0,0 +1,137 @@
+
+# Set up the clean and clobber tasks
+CLOBBER.include(REPORT_DIR, 'test_root/*_repo', 'test_root/staticfiles')
+
+$failed_tests = 0
+
+def run_under_coverage(cmd, root)
+    cmd0, cmd_rest = cmd.split(" ", 2)
+    # We use "python -m coverage" so that the proper python will run the importable coverage
+    # rather than the coverage that OS path finds.
+    cmd = "python -m coverage run --rcfile=#{root}/.coveragerc `which #{cmd0}` #{cmd_rest}"
+    return cmd
+end
+
+def run_tests(system, report_dir, stop_on_failure=true)
+    ENV['NOSE_XUNIT_FILE'] = File.join(report_dir, "nosetests.xml")
+    dirs = Dir["common/djangoapps/*"] + Dir["#{system}/djangoapps/*"]
+    cmd = django_admin(system, :test, 'test', '--logging-clear-handlers', *dirs.each)
+    sh(run_under_coverage(cmd, system)) do |ok, res|
+        if !ok and stop_on_failure
+            abort "Test failed!"
+        end
+        $failed_tests += 1 unless ok
+    end
+end
+
+def run_acceptance_tests(system, report_dir, harvest_args)
+    sh(django_admin(system, 'acceptance', 'syncdb', '--noinput'))
+    sh(django_admin(system, 'acceptance', 'migrate', '--noinput'))
+    sh(django_admin(system, 'acceptance', 'harvest', '--debug-mode', '--tag -skip', harvest_args))
+end
+
+
+directory REPORT_DIR
+
+task :clean_test_files do
+    sh("git clean -fqdx test_root")
+end
+
+TEST_TASK_DIRS = []
+
+[:lms, :cms].each do |system|
+    report_dir = report_dir_path(system)
+
+    # Per System tasks
+    desc "Run all django tests on our djangoapps for the #{system}"
+    task "test_#{system}", [:stop_on_failure] => ["clean_test_files", :predjango, "#{system}:gather_assets:test", "fasttest_#{system}"]
+
+    # Have a way to run the tests without running collectstatic -- useful when debugging without
+    # messing with static files.
+    task "fasttest_#{system}", [:stop_on_failure] => [report_dir, :install_prereqs, :predjango] do |t, args|
+        args.with_defaults(:stop_on_failure => 'true')
+        run_tests(system, report_dir, args.stop_on_failure)
+    end
+
+    # Run acceptance tests
+    desc "Run acceptance tests"
+    task "test_acceptance_#{system}", [:harvest_args] => ["#{system}:gather_assets:acceptance", "fasttest_acceptance_#{system}"]
+
+    desc "Run acceptance tests without collectstatic"
+    task "fasttest_acceptance_#{system}", [:harvest_args] => ["clean_test_files", :predjango, report_dir] do |t, args|
+        args.with_defaults(:harvest_args => '')
+        run_acceptance_tests(system, report_dir, args.harvest_args)
+    end
+
+
+    task :fasttest => "fasttest_#{system}"
+
+    TEST_TASK_DIRS << system
+end
+
+Dir["common/lib/*"].select{|lib| File.directory?(lib)}.each do |lib|
+    task_name = "test_#{lib}"
+
+    report_dir = report_dir_path(lib)
+
+    desc "Run tests for common lib #{lib}"
+    task task_name => report_dir do
+        ENV['NOSE_XUNIT_FILE'] = File.join(report_dir, "nosetests.xml")
+        cmd = "nosetests #{lib}"
+        sh(run_under_coverage(cmd, lib)) do |ok, res|
+            $failed_tests += 1 unless ok
+        end
+    end
+    TEST_TASK_DIRS << lib
+
+    desc "Run tests for common lib #{lib} (without coverage)"
+    task "fasttest_#{lib}" do
+        sh("nosetests #{lib}")
+    end
+end
+
+task :report_dirs
+
+TEST_TASK_DIRS.each do |dir|
+    report_dir = report_dir_path(dir)
+    directory report_dir
+    task :report_dirs => [REPORT_DIR, report_dir]
+end
+
+task :test do
+    TEST_TASK_DIRS.each do |dir|
+        Rake::Task["test_#{dir}"].invoke(false)
+    end
+
+    if $failed_tests > 0
+        abort "Tests failed!"
+    end
+end
+
+namespace :coverage do
+    desc "Build the html coverage reports"
+    task :html => :report_dirs do
+        TEST_TASK_DIRS.each do |dir|
+            report_dir = report_dir_path(dir)
+
+            if !File.file?("#{report_dir}/.coverage")
+                next
+            end
+
+            sh("coverage html --rcfile=#{dir}/.coveragerc")
+        end
+    end
+
+    desc "Build the xml coverage reports"
+    task :xml => :report_dirs do
+        TEST_TASK_DIRS.each do |dir|
+            report_dir = report_dir_path(dir)
+
+            if !File.file?("#{report_dir}/.coverage")
+                next
+            end
+            # Why doesn't the rcfile control the xml output file properly??
+            sh("coverage xml -o #{report_dir}/coverage.xml --rcfile=#{dir}/.coveragerc")
+        end
+    end
+end