fixes
This commit is contained in:
parent
60639f2e63
commit
710772ca29
|
@ -3,15 +3,9 @@ package inarea
|
||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
"github.com/FreifunkBremen/yanic/data"
|
"github.com/FreifunkBremen/yanic/data"
|
||||||
"github.com/FreifunkBremen/yanic/runtime"
|
"github.com/FreifunkBremen/yanic/runtime"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
=======
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"yanic/data"
|
|
||||||
"yanic/runtime"
|
|
||||||
>>>>>>> 64b9cfe (add primary_domain_dode)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestFilterInArea(t *testing.T) {
|
func TestFilterInArea(t *testing.T) {
|
||||||
|
|
|
@ -3,8 +3,8 @@ package prometheus_sd
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"yanic/output"
|
"github.com/FreifunkBremen/yanic/output"
|
||||||
"yanic/runtime"
|
"github.com/FreifunkBremen/yanic/runtime"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Output struct {
|
type Output struct {
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package prometheus_sd
|
package prometheus_sd
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
|
||||||
"net"
|
"net"
|
||||||
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"yanic/data"
|
"github.com/FreifunkBremen/yanic/data"
|
||||||
"yanic/runtime"
|
"github.com/FreifunkBremen/yanic/runtime"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestOutput(t *testing.T) {
|
func TestOutput(t *testing.T) {
|
||||||
|
|
Loading…
Reference in New Issue