Changeset 3280


Ignore:
Timestamp:
Dec 3, 2010 10:47:54 PM (10 years ago)
Author:
wehart
Message:

Merged revisions 3177-3279 via svnmerge from
https://software.sandia.gov/svn/public/coopr/coopr.opt/trunk

........

r3233 | wehart | 2010-11-12 15:56:28 -0700 (Fri, 12 Nov 2010) | 4 lines


Migrating OS-specific functionality into coopr.os


Adding coopr.os to the dev.ini config file.

........

r3235 | wehart | 2010-11-12 16:12:03 -0700 (Fri, 12 Nov 2010) | 2 lines


Migrating OS test scripts/files to coopr.os

........

r3238 | wehart | 2010-11-12 23:22:31 -0700 (Fri, 12 Nov 2010) | 2 lines


Misc test fix

........

r3239 | wehart | 2010-11-13 01:24:14 -0700 (Sat, 13 Nov 2010) | 2 lines


Update to tests to account for changes in OS.

........

r3245 | wehart | 2010-11-13 10:45:42 -0700 (Sat, 13 Nov 2010) | 2 lines


Removed reference to osrl.

........

Location:
coopr.opt/stable
Files:
10 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • coopr.opt/stable

  • coopr.opt/stable/coopr/opt/__init__.py

    r2715 r3280  
    1717import solver
    1818import reader
    19 #import testing
    2019from parallel import *
    2120
     
    3130    for entrypoint in pkg_resources.iter_entry_points('coopr.opt'):
    3231        plugin_class = entrypoint.load()
    33 except:
    34     pass
     32except Exception, err:
     33    print "Error loading coopr.opt entry points:",str(err)
    3534
  • coopr.opt/stable/coopr/opt/reader/__init__.py

    r1254 r3280  
    99#  _________________________________________________________________________
    1010
    11 import OS
     11#import OS
    1212import sol
    1313import res
  • coopr.opt/stable/coopr/opt/tests/base/test_factory.py

    r2591 r3280  
    131131        """
    132132        ans = coopr.opt.ReaderFactory.services()
    133         self.failUnlessEqual(len(ans),4)
    134         self.failUnlessEqual(set(ans), set(["osrl","rtest", "sol","yaml"]))
     133        self.failUnless(set(ans) >= set(["rtest", "sol","yaml"]))
    135134
    136135    def test_reader_instance(self):
     
    140139        ans = coopr.opt.ReaderFactory("none")
    141140        self.failUnlessEqual(ans, None)
    142         ans = coopr.opt.ReaderFactory("osrl")
    143         self.failUnlessEqual(type(ans), coopr.opt.reader.OS.ResultsReader_osrl)
     141        ans = coopr.opt.ReaderFactory("sol")
     142        self.failUnlessEqual(type(ans), coopr.opt.reader.sol.ResultsReader_sol)
    144143        #ans = coopr.opt.ReaderFactory("osrl", "myreader")
    145144        #self.failUnlessEqual(type(ans), coopr.opt.reader.OS.ResultsReader_osrl)
Note: See TracChangeset for help on using the changeset viewer.