Fix tests

gpioioctl/basic_test.go

@@ -48,7 +48,9 @@ func init() {
 		}
 		Chips = append(Chips, &chip)
 		if err = gpioreg.Register(&line); err != nil {
-			log.Println("chip", chip.Name(), " gpioreg.Register(line) ", line, " returned ", err)
+			nameStr := chip.Name()
+			lineStr := line.String()
+			log.Println("chip", nameStr, " gpioreg.Register(line) ", lineStr, " returned ", err)
 		}
 	}
 }
@@ -69,7 +71,7 @@ func TestChips(t *testing.T) {
 		t.Errorf("Incorrect line count. Found: %d for LineCount, Returned Lines length=%d", chip.LineCount(), len(chip.Lines()))
 	}
 	for _, line := range chip.Lines() {
-		if len(line.Consumer()) == 0 {
+		if len(line.Consumer()) == 0 && len(line.Name()) > 0 {
 			testLine = line
 			break
 		}
@@ -90,6 +92,9 @@ func TestChips(t *testing.T) {
 }
 
 func TestGPIORegistryByName(t *testing.T) {
+	if testLine == nil {
+		return
+	}
 	outLine := gpioreg.ByName(testLine.Name())
 	if outLine == nil {
 		t.Fatalf("Error retrieving GPIO Line %s", testLine.Name())
@@ -105,6 +110,9 @@ func TestGPIORegistryByName(t *testing.T) {
 
 func TestNumber(t *testing.T) {
 	chip := Chips[0]
+	if testLine == nil {
+		return
+	}
 	l := chip.ByName(testLine.Name())
 	if l == nil {
 		t.Fatalf("Error retrieving GPIO Line %s", testLine.Name())
@@ -120,6 +128,9 @@ func TestNumber(t *testing.T) {
 }
 
 func TestString(t *testing.T) {
+	if testLine == nil {
+		return
+	}
 	line := gpioreg.ByName(testLine.Name())
 	if line == nil {
 		t.Fatalf("Error retrieving GPIO Line %s", testLine.Name())

gpioioctl/gpio.go

@@ -65,7 +65,7 @@
 	// to the pin numbering scheme that may be in use on a board.
 	number uint32
 	// The name supplied by the OS Driver
-	name string `json:"Name"`
+	name string
 	// If the line is in use, this may be populated with the
 	// consuming application's information.
 	consumer  string
@@ -96,7 +96,7 @@
 	if line.fEdge != nil {
 		line.fEdge.Close()
 	} else if line.fd != 0 {
 		syscall.Close(int(line.fd))
 	}
 	line.fd = 0
 	line.consumer = ""
@@ -242,7 +242,7 @@
 	}
 	var err error
 	if line.fEdge == nil {
 		err = syscall.SetNonblock(int(line.fd), true)
 		if err != nil {
 			log.Println("WaitForEdge() SetNonblock(): ", err)
 			return false
@@ -361,7 +361,7 @@
 	chip := GPIOChip{path: path}
 	f, err := os.OpenFile(path, os.O_RDONLY, 0444)
 	if err != nil {
 		err = fmt.Errorf("Opening GPIO Chip %s failed. Error: %w", path, err)
 		log.Println(err)
 		return nil, err
 	}
@@ -405,7 +405,7 @@
 	for _, lineset := range chip.lineSets {
 		lineset.Close()
 	}
 	syscall.Close(int(chip.fd))
 }
 
 // ByName returns a GPIOLine for a specific name. If not
@@ -460,7 +460,7 @@
 	for ix, name := range config.Lines {
 		gpioLine := chip.ByName(name)
 		if gpioLine == nil {
 			return nil, fmt.Errorf("Line %s not found in chip %s", name, chip.Name())
 		}
 		lines[ix] = uint32(gpioLine.Number())
 	}