From 518346deab944770b17bb290e536ea4da3d5b184 Mon Sep 17 00:00:00 2001
From: Florian Staudacher <florian_staudacher@yahoo.de>
Date: Fri, 6 Apr 2012 01:50:35 +0200
Subject: [PATCH] try setting a higher swappiness, take other val for mem
 calculation

---
 script/ci/before.sh                         | 3 ++-
 spec/support/deferred_garbage_collection.rb | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/script/ci/before.sh b/script/ci/before.sh
index 58f4ed22a..728f0c3bc 100755
--- a/script/ci/before.sh
+++ b/script/ci/before.sh
@@ -14,9 +14,10 @@ sh -e /etc/init.d/xvfb start
 
 # setup swapfile
 echo "creating a swapfile"
-sudo dd if=/dev/zero of=swapfile bs=1M count=128
+sudo dd if=/dev/zero of=swapfile bs=1M count=96
 sudo mkswap swapfile
 sudo swapon swapfile
+sudo sysctl vm.swappiness=100
 
 # Create a database.yml for the right database
 echo "Setting up database.yml for $DB"
diff --git a/spec/support/deferred_garbage_collection.rb b/spec/support/deferred_garbage_collection.rb
index fd6e5865f..fb518230b 100644
--- a/spec/support/deferred_garbage_collection.rb
+++ b/spec/support/deferred_garbage_collection.rb
@@ -14,7 +14,7 @@ class DeferredGarbageCollection
   def self.memory_threshold
     @mem = %x(free 2>/dev/null).to_s.split(" ")
     return nil if @mem.empty?
-    @mem[8].to_i / (@mem[7].to_i/100)
+    @mem[15].to_i / (@mem[7].to_i/100)
   end
 
   def self.reconsider