zerochaos    14/04/28 16:37:39

  Modified:             metasploit-9999.ebuild ChangeLog
  Log:
  minor updates and fixes for tests (which still don't pass)
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
DD11F94A)

Revision  Changes    Path
1.23                 net-analyzer/metasploit/metasploit-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild?rev=1.23&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild?rev=1.23&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild?r1=1.22&r2=1.23

Index: metasploit-9999.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- metasploit-9999.ebuild      25 Apr 2014 16:48:54 -0000      1.22
+++ metasploit-9999.ebuild      28 Apr 2014 16:37:38 -0000      1.23
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v 1.22 
2014/04/25 16:48:54 zerochaos Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v 1.23 
2014/04/28 16:37:38 zerochaos Exp $
 
 EAPI="5"
 
@@ -206,24 +206,24 @@
 each_ruby_test() {
        #review dev-python/pymongo for ways to make the test compatible with 
FEATURES=network-sandbox
 
-       # https://dev.metasploit.com/redmine/issues/8425
-       ${RUBY} -S rake db:create || die
-       ${RUBY} -S rake db:migrate || die
-
        #we bogart msfupdate so no point in trying to test it
        rm spec/msfupdate_spec.rb || die
        #we don't really want to be uploading to virustotal during the tests
-       rm spec/tools/virustotal_spec.rb
+       rm spec/tools/virustotal_spec.rb || die
 
-       RAILS_ENV=test MSF_DATABASE_CONFIG=config/database.yml ${RUBY} -S rake 
spec || die
+       # https://dev.metasploit.com/redmine/issues/8425
+       ${RUBY} -S bundle exec rake db:create || die
+       ${RUBY} -S bundle exec rake db:migrate || die
+
+       MSF_DATABASE_CONFIG=config/database.yml ${RUBY} -S bundle exec rake  || 
die
        su postgres -c "dropuser msf_test_user" || die "failed to cleanup 
msf_test-user"
 }
 
 each_ruby_install() {
        #Tests have already been run, we don't need this stuff
-       rm -r spec
-       rm -r test
-       rm Gemfile.lock
+       rm -r spec || die
+       rm -r test || die
+       rm Gemfile.lock || die
 
        #I'm 99% sure that this will only work for as long as we only support 
one ruby version.  Creativity will be needed if we wish to support multiple.
        # should be as simple as copying everything into the target...



1.92                 net-analyzer/metasploit/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/ChangeLog?rev=1.92&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/ChangeLog?rev=1.92&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/ChangeLog?r1=1.91&r2=1.92

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ChangeLog   25 Apr 2014 16:48:54 -0000      1.91
+++ ChangeLog   28 Apr 2014 16:37:39 -0000      1.92
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/metasploit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.91 
2014/04/25 16:48:54 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.92 
2014/04/28 16:37:39 zerochaos Exp $
+
+  28 Apr 2014; Rick Farina <[email protected]> metasploit-9999.ebuild:
+  minor updates and fixes for tests (which still don't pass)
 
   25 Apr 2014; Rick Farina <[email protected]> +files/bug-8792.patch,
   metasploit-9999.ebuild:




Reply via email to