move PR testing code into a method

so it can be reused for swift

Rakefile

@@ -5,7 +5,7 @@ def base_dir
   File.expand_path(File.dirname(__FILE__))
 end
 
-$LOAD_PATH.push("#{base_dir}/lib")
+#$LOAD_PATH.push("#{base_dir}/lib")
 require 'puppetlabs/os_tester'
 #require File.join(base_dir, 'lib', 'puppetlabs', 'os_tester')
 
@@ -28,7 +28,6 @@ def log_file
   @log_file = log_file
 end
 
-
 namespace :openstack do
 
   desc 'clone all required modules'
@@ -145,30 +144,22 @@ namespace :test do
     system "bash -c 'rspec spec/test_two_node.rb;echo $?' 2>&1 | tee #{log_file}"
   end
 
-  desc 'checkout and test a pull request, publish the results'
-  task 'pull_request', [:project_name, :number] do |t, args|
+  desc 'Checkout fresh master environment and test the deployment of a swift cluster'
+  task 'swift_master' do
     refresh_modules
-    checkout_pr(
-      args.project_name,
-      args.number,
-      [github_login],
-      'test_it',
-      {
-        :login    => github_login,
-        :password => github_password
-      }
-    )
-    system "bash -c 'rspec spec/test_two_node.rb;echo $?' 2>&1 | tee #{log_file}"
-    results = File.read(log_file)
-    publish_results(
-      args.project_name,
-      args.number,
-      results.split("\n").last == '0' ? 'passed' : 'failed',
-      results,
-      {
-        :login    => github_login,
-        :password => github_password
-      }
+    system "bash -c 'rspec spec/test_swift_cluster.rb;echo $?' 2>&1 | tee #{log_file}"
+  end
+
+  desc 'checkout and test a pull request, publish the results'
+  task 'pull_request', [:repo_name, :pull_request_number] do |t, args|
+    test_pull_request(
+      args.repo_name,
+      args.pull_request_number,
+      github_login,
+      github_password,
+      'spec/test_two_node.rb',
+      log_file,
+      'test_it'
     )
   end
 

lib/puppetlabs/os_tester/github.rb

@@ -8,6 +8,61 @@ module Puppetlabs
 
       include Puppetlabs::OsTester::Librarian
 
+      # checkout a specified pull request and test it
+      # Parameters:
+      #   repo_name::
+      #     short name of the repo to pull from (ex: nova, glance, ...)
+      #   pull_request_number::
+      #     number of pull request to pull for testing
+      #   github_login::
+      #     log in used for authentication. This user must specify the test message
+      #     in the comments of this pull request. This is also the user that will
+      #     post the test results.
+      #   github_password::
+      #     password for github user.
+      #   rspec_test::
+      #     file path for rspec file to use to test pull request.
+      #   log_file::
+      #     location of log file where test results are written.
+      #     TODO - get rid of this in favor of a real logger
+      #   test_message::
+      #     message that indicates that a pull request can be tested. It should
+      #     be written by the github user as a PR comment on the PR being tested.
+      def test_pull_request(
+        repo_name,
+        pull_request_number,
+        github_login,
+        github_password,
+        rspec_test,
+        log_file,
+        test_message = 'schedule_for_testing'
+      )
+        # reset everthing to master
+        refresh_modules
+        checkout_pr(
+          repo_name,
+          pull_request_number,
+          [github_login],
+          test_message,
+          {
+            :login    => github_login,
+            :password => github_password
+          }
+        )
+        system "bash -c 'rspec #{rspec_test}; echo $?' 2>&1 | tee #{log_file}"
+        results = File.read(log_file)
+        publish_results(
+          args.project_name,
+          args.number,
+          results.split("\n").last == '0' ? 'passed' : 'failed',
+          results,
+          {
+            :login    => github_login,
+            :password => github_password
+          }
+        )
+      end
+
       # has specified the expected body.
       def testable_pull_request?(
         pr,