fda/ch.psi.fda
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed configurations and disabled tests (CRLOGIC - because of defect

Browse Source 
hardware setup ...)
This commit is contained in:
ebner
2012-02-06 09:04:56 +01:00
parent 8881063dae
commit 290ea839b9
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ch.psi.fda/src/test/java/ch/psi/fda/TestConfiguration.java
View File

@@ -29,8 +29,8 @@ public class TestConfiguration {
private final String crlogicPrefix = "MTEST-HW3-CRL";
private final String prefixScaler = "MTEST-HW3:JS";
private final String server = "yoke.psi.ch";
private final String share = "/usr/local/nfsshare";
private final String smbShare = "smb://:@"+server+"/otftemp/"; // It is important to have the last slash / !
private final String share = "/usr/nfs";
private final String smbShare = "smb://:@"+server+"/nfs/"; // It is important to have the last slash / !
private final String motor1 = "MTEST-HW3:MOT1";
private final String analogIn1 = "MTEST-HW3-AI1:AI_01";

19
ch.psi.fda/src/test/java/ch/psi/fda/core/loops/SambaTest.java
View File

@@ -33,15 +33,14 @@ public class SambaTest {
private static final Logger logger = Logger.getLogger(SambaTest.class.getName());
@Ignore
@Test
public void testSamba() throws Exception{
// System.setProperty("jcifs.smb.client.dfs.disabled", "true");
// System.setProperty("jcifs.smb.client.ssnLimit", "1");
// System.setProperty("jcifs.smb.client.domain", "x05la.psi.ch");
System.setProperty("jcifs.smb.client.username", "x05laop");
System.setProperty("jcifs.smb.client.password", "mXAS");
// System.setProperty("jcifs.smb.client.username", "x05laop");
// System.setProperty("jcifs.smb.client.password", "mXAS");
//
// System.setProperty("jcifs.util.loglevel", "6");
@@ -51,17 +50,17 @@ public class SambaTest {
String smbShare = "";
// smbShare = "smb://x05laop:mXAS@x05la/x05laop/Data1/otfTmp/";
smbShare = "smb://x05la.psi.ch/x05laop/Data1/otfTmp/";
// smbShare = "smb://x05la.psi.ch/x05laop/Data1/otfTmp/";
// smbShare = "smb://x05laop:mXAS@x05la/x05laop/Data1/otfTmp/000000.txt.lock";
// smbShare = "smb://:@yoke.psi.ch/otftemp/";
smbShare = "smb://:@yoke.psi.ch/nfs/";
// NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication("x05laop:mXAS");
// SmbFile tmpDir = new SmbFile(smbShare,auth);
SmbFile tmpDir = new SmbFile(smbShare);
// SmbFile tmpDir = new SmbFile(smbShare);
// tmpDir.createNewFile();
logger.info(""+tmpDir.exists());
logger.info(""+tmpDir.isDirectory());
SmbFile tmpFile = new SmbFile(tmpDir, "000000.txt.lock");
tmpFile.exists();
// logger.info(""+tmpDir.exists());
// logger.info(""+tmpDir.isDirectory());
// SmbFile tmpFile = new SmbFile(tmpDir, "000000.txt.lock");
// tmpFile.exists();
}
}

2
ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ParallelCrlogicTest.java
View File

@@ -29,6 +29,7 @@ import java.util.logging.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import ch.psi.fda.TestConfiguration;
@@ -65,6 +66,7 @@ public class ParallelCrlogicTest {
public void tearDown() throws Exception {
}
@Ignore
@Test(timeout=60000)
public void testExecute() throws InterruptedException, CAException{

4
ch.psi.fda/src/test/resources/home/config/fda.properties
View File

@@ -4,8 +4,8 @@ ch.psi.fda.aq.data.filePrefix=${yyyy_MM}/${yyyyMMdd}/${yyyyMMddHHmmss}_${name}/$
# OTF scan related configuration
ch.psi.fda.aq.otf.channelPrefix=MTEST-HW3-OTFX
ch.psi.fda.aq.otf.nfsServer=yoke.psi.ch
ch.psi.fda.aq.otf.nfsShare=/usr/local/nfsshare
ch.psi.fda.aq.otf.smbShare=smb://:@yoke.psi.ch/otftemp/
ch.psi.fda.aq.otf.nfsShare=/usr/nfs
ch.psi.fda.aq.otf.smbShare=smb://:@yoke.psi.ch/nfs/
ch.psi.fda.aq.otf.useCrlogic=true
ch.psi.fda.aq.otf.crlogicPrefix=MTEST-HW3-CRL